Allow list editor to work with Backbone.Model

distribution.amd/backbone-forms.js

@@ -2012,22 +2012,24 @@ Form.editors.NestedModel = Form.editors.Object.extend({
  Form.editors.Base.prototype.initialize.call(this, options);
 
  if (!this.form) throw new Error('Missing required option "form"');
- if (!options.schema.model) throw new Error('Missing required "schema.model" option for NestedModel editor');
  },
 
  render: function() {
  //Get the constructor for creating the nested form; i.e. the same constructor as used by the parent form
  var NestedForm = this.form.constructor;
 
  var data = this.value || {},
- key = this.key,
- nestedModel = this.schema.model;
+ key = this.key;
 
+ // TODO: This works for me as my nested models are never null but what about Backbone.Relational or other implementations?
  //Wrap the data in a model if it isn't already a model instance
- var modelInstance = (data.constructor === nestedModel) ? data : new nestedModel(data);
+ if (!(data instanceof Backbone.Model)) {
+ if (!this.schema.model) throw new Error('Missing required "schema.model" option for NestedModel editor');
+ data = new this.schema.model(data)
+ }
 
  this.nestedForm = new NestedForm({
- model: modelInstance,
+ model: data,
  idPrefix: this.id + '_',
  fieldTemplate: 'nestedField'
  });
@@ -2056,8 +2058,17 @@ Form.editors.NestedModel = Form.editors.Object.extend({
  }
 
  return Form.editors.Object.prototype.commit.call(this);
- }
+ },
+
+ getValue: function() {
+ if (this.nestedForm) {
+ // Return the value in the same way you got it
+ if (this.value instanceof Backbone.Model) this.nestedForm.commit();
+ else return this.nestedForm.getValue();
+ }
 
+ return this.value;
+ }
 });
 
 /**

distribution.amd/editors/list.js

@@ -512,10 +512,14 @@ define(['jquery', 'underscore', 'backbone', 'backbone-forms'], function($, _, Ba
  var self = this,
  ModalForm = this.form.constructor;
 
- var form = this.modalForm = new ModalForm({
- schema: this.nestedSchema,
- data: this.value
- });
+ var formAttrs = { schema: this.nestedSchema };
+ if (this.value instanceof Backbone.Model) {
+ formAttrs.model = this.value;
+ }
+ else {
+ formAttrs.data = this.value;
+ }
+ var form = this.modalForm = new ModalForm(formAttrs);
 
  var modal = this.modal = new Form.editors.List.Modal.ModalAdapter({
  content: form,
@@ -546,7 +550,12 @@ define(['jquery', 'underscore', 'backbone', 'backbone-forms'], function($, _, Ba
  if (error) return modal.preventClose();
 
  //Store form value
- this.value = form.getValue();
+ if (this.value instanceof Backbone.Model) {
+ form.commit();
+ }
+ else {
+ this.value = form.getValue();
+ }
 
  //Render item
  this.renderSummary();

distribution/backbone-forms.js

@@ -2025,22 +2025,24 @@ Form.editors.NestedModel = Form.editors.Object.extend({
  Form.editors.Base.prototype.initialize.call(this, options);
 
  if (!this.form) throw new Error('Missing required option "form"');
- if (!options.schema.model) throw new Error('Missing required "schema.model" option for NestedModel editor');
  },
 
  render: function() {
  //Get the constructor for creating the nested form; i.e. the same constructor as used by the parent form
  var NestedForm = this.form.constructor;
 
  var data = this.value || {},
- key = this.key,
- nestedModel = this.schema.model;
+ key = this.key;
 
+ // TODO: This works for me as my nested models are never null but what about Backbone.Relational or other implementations?
  //Wrap the data in a model if it isn't already a model instance
- var modelInstance = (data.constructor === nestedModel) ? data : new nestedModel(data);
+ if (!(data instanceof Backbone.Model)) {
+ if (!this.schema.model) throw new Error('Missing required "schema.model" option for NestedModel editor');
+ data = new this.schema.model(data)
+ }
 
  this.nestedForm = new NestedForm({
- model: modelInstance,
+ model: data,
  idPrefix: this.id + '_',
  fieldTemplate: 'nestedField'
  });
@@ -2069,8 +2071,17 @@ Form.editors.NestedModel = Form.editors.Object.extend({
  }
 
  return Form.editors.Object.prototype.commit.call(this);
- }
+ },
+
+ getValue: function() {
+ if (this.nestedForm) {
+ // Return the value in the same way you got it
+ if (this.value instanceof Backbone.Model) this.nestedForm.commit();
+ else return this.nestedForm.getValue();
+ }
 
+ return this.value;
+ }
 });
 
 /**