Merge pull request #1 from sonechiman/master

Add nested form
claudetech · Apr 4, 2016 · 3a36b38 · 3a36b38
2 parents a52bddd + 2ae3de6
commit 3a36b38
Show file tree

Hide file tree

Showing 10 changed files with 236 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -171,7 +171,7 @@ MyInput.defaultTag = 'my-tag'
 riotForm.inputFactory.register(MyInput)
 ```
 
-or with ES5
+or with ES6
 
 ```javascript
 // ES6

diff --git a/dist/riot-form.js b/dist/riot-form.js
diff --git a/dist/riot-form.js.map b/dist/riot-form.js.map
diff --git a/dist/riot-form.min.js b/dist/riot-form.min.js
diff --git a/dist/riot-form.min.js.map b/dist/riot-form.min.js.map
diff --git a/lib/form-builder.js b/lib/form-builder.js
@@ -9,6 +9,7 @@ export default class FormBuilder {
     assert(name, 'You must provide a name for the form')
     this._model = {}
     this._inputs = {}
+    this._forms = {}
     this._name = name
   }
 
@@ -17,7 +18,6 @@ export default class FormBuilder {
       input = inputFactory.create(input)
     }
     assert(input.name, 'You must provide an input name')
-    input.formName = this._name
     this._inputs[input.name] = input
     return this
   }
@@ -29,6 +29,13 @@ export default class FormBuilder {
     return this
   }
 
+  addNestedForm(form) {
+    assert(form instanceof Form, 'A form must be instance of Form')
+    form.name = this._name + '.' +  form.name
+    this._forms[form.name] = form
+    return this
+  }
+
   setModel(model) {
     this._model = model
     return this
@@ -38,6 +45,7 @@ export default class FormBuilder {
     return new Form(assign({
       model: this._model,
       inputs: this._inputs,
+      forms: this._forms,
       name: this._name
     }, config))
   }