Move DSL builder functions out of the companion objects (#93)

1 files changed, 13 insertions, 15 deletions

diff --git a/src/main/kotlin/pl/treksoft/kvision/form/FieldLabel.kt b/src/main/kotlin/pl/treksoft/kvision/form/FieldLabel.kt
index 4684b1be..8413eb3c 100644
--- a/src/main/kotlin/pl/treksoft/kvision/form/FieldLabel.kt
+++ b/src/main/kotlin/pl/treksoft/kvision/form/FieldLabel.kt
@@ -46,20 +46,18 @@ open class FieldLabel(
     override fun getSnAttrs(): List<StringPair> {
         return super.getSnAttrs() + ("for" to forId)
     }
+}
 
-    companion object {
-        /**
-         * DSL builder extension function.
-         *
-         * It takes the same parameters as the constructor of the built component.
-         */
-        fun Container.fieldLabel(
-            forId: String, content: String? = null, rich: Boolean = false,
-            classes: Set<String> = setOf("control-label"), init: (FieldLabel.() -> Unit)? = null
-        ): FieldLabel {
-            val fieldLabel = FieldLabel(forId, content, rich, classes).apply { init?.invoke(this) }
-            this.add(fieldLabel)
-            return fieldLabel
-        }
-    }
+/**
+ * DSL builder extension function.
+ *
+ * It takes the same parameters as the constructor of the built component.
+ */
+fun Container.fieldLabel(
+    forId: String, content: String? = null, rich: Boolean = false,
+    classes: Set<String> = setOf("control-label"), init: (FieldLabel.() -> Unit)? = null
+): FieldLabel {
+    val fieldLabel = FieldLabel(forId, content, rich, classes).apply { init?.invoke(this) }
+    this.add(fieldLabel)
+    return fieldLabel
 }