Merge branch 'fix-userinitiated' of https://github.com/elasticsales/b…

…ackbone-forms Add addItem docs
powmedia · Aug 15, 2012 · 461c3c7 · 461c3c7
1 parent c6d56d4
commit 461c3c7
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 22 deletions.
diff --git a/distribution.amd/backbone-forms.js b/distribution.amd/backbone-forms.js
@@ -332,7 +332,9 @@ var Form = (function() {
      */
     setValue: function(data) {
       for (var key in data) {
-        this.fields[key].setValue(data[key]);
+        if (_.has(this.fields, key)) {
+          this.fields[key].setValue(data[key]);
+        }
       }
     },
 

diff --git a/distribution.amd/backbone-forms.min.js b/distribution.amd/backbone-forms.min.js
diff --git a/distribution.amd/editors/list.js b/distribution.amd/editors/list.js
@@ -19,7 +19,7 @@ define(['jquery', 'underscore', 'backbone'], function($, _, Backbone) {
     events: {
       'click [data-action="add"]': function(event) {
         event.preventDefault();
-        this.addItem();
+        this.addItem(null, true);
       }
     },
 
@@ -31,7 +31,8 @@ define(['jquery', 'underscore', 'backbone'], function($, _, Backbone) {
 
       //List schema defaults
       this.schema = _.extend({
-        listTemplate: 'list'
+        listTemplate: 'list',
+        listItemTemplate: 'listItem'
       }, schema);
 
       //Determine the editor to use
@@ -86,7 +87,8 @@ define(['jquery', 'underscore', 'backbone'], function($, _, Backbone) {
 
     /**
      * Add a new item to the list
-     * @param {Mixed} [value]     Value for the new item editor
+     * @param {Mixed} [value]           Value for the new item editor
+     * @param {Boolean} [userInitiated] If the item was added by the user clicking 'add'
      */
     addItem: function(value, userInitiated) {
       var self = this;
@@ -113,7 +115,7 @@ define(['jquery', 'underscore', 'backbone'], function($, _, Backbone) {
           args.splice(1, 0, self);
           // args = ["item:key:change", this=listEditor, itemEditor, fieldEditor]
 
-          editors.List.prototype.trigger.apply(this, args)
+          editors.List.prototype.trigger.apply(this, args);
         }, self);
 
         item.editor.on('change', function() {
@@ -146,7 +148,7 @@ define(['jquery', 'underscore', 'backbone'], function($, _, Backbone) {
           self.trigger('add', self, item.editor);
           self.trigger('change', self);
         }
-      }
+      };
 
       //Check if we need to wait for the item to complete before adding to the list
       if (this.Editor.isAsync) {
@@ -291,7 +293,7 @@ define(['jquery', 'underscore', 'backbone'], function($, _, Backbone) {
       }).render();
 
       //Create main element
-      var $el = $(Form.templates.listItem({
+      var $el = $(Form.templates[this.schema.listItemTemplate]({
         editor: '<b class="bbf-tmp"></b>'
       }));
 

diff --git a/distribution.amd/editors/list.min.js b/distribution.amd/editors/list.min.js
diff --git a/distribution/backbone-forms.js b/distribution/backbone-forms.js
@@ -345,7 +345,9 @@ var Form = (function() {
      */
     setValue: function(data) {
       for (var key in data) {
-        this.fields[key].setValue(data[key]);
+        if (_.has(this.fields, key)) {
+          this.fields[key].setValue(data[key]);
+        }
       }
     },
 

diff --git a/distribution/backbone-forms.min.js b/distribution/backbone-forms.min.js
diff --git a/distribution/editors/list.js b/distribution/editors/list.js
@@ -17,7 +17,7 @@
     events: {
       'click [data-action="add"]': function(event) {
         event.preventDefault();
-        this.addItem();
+        this.addItem(null, true);
       }
     },
 
@@ -29,7 +29,8 @@
 
       //List schema defaults
       this.schema = _.extend({
-        listTemplate: 'list'
+        listTemplate: 'list',
+        listItemTemplate: 'listItem'
       }, schema);
 
       //Determine the editor to use
@@ -84,7 +85,8 @@
 
     /**
      * Add a new item to the list
-     * @param {Mixed} [value]     Value for the new item editor
+     * @param {Mixed} [value]           Value for the new item editor
+     * @param {Boolean} [userInitiated] If the item was added by the user clicking 'add'
      */
     addItem: function(value, userInitiated) {
       var self = this;
@@ -111,7 +113,7 @@
           args.splice(1, 0, self);
           // args = ["item:key:change", this=listEditor, itemEditor, fieldEditor]
 
-          editors.List.prototype.trigger.apply(this, args)
+          editors.List.prototype.trigger.apply(this, args);
         }, self);
 
         item.editor.on('change', function() {
@@ -144,7 +146,7 @@
           self.trigger('add', self, item.editor);
           self.trigger('change', self);
         }
-      }
+      };
 
       //Check if we need to wait for the item to complete before adding to the list
       if (this.Editor.isAsync) {
@@ -289,7 +291,7 @@
       }).render();
 
       //Create main element
-      var $el = $(Form.templates.listItem({
+      var $el = $(Form.templates[this.schema.listItemTemplate]({
         editor: '<b class="bbf-tmp"></b>'
       }));