Upgrading to Backbone 0.9.10

powmedia · Feb 7, 2013 · e0f7be2 · e0f7be2
1 parent 0116fea
commit e0f7be2
Show file tree

Hide file tree

Showing 5 changed files with 1,507 additions and 10 deletions.
diff --git a/src/editors.js b/src/editors.js
@@ -92,15 +92,14 @@ Form.editors = (function() {
      *
      * @return {Mixed} error
      */
-    commit: function() {
+    commit: function(options) {
       var error = this.validate();
       if (error) return error;
 
-      this.model.set(this.key, this.getValue(), {
-        error: function(model, e) {
-          error = e;
-        }
+      this.listenTo(this.model, 'invalid', function(model, e) {
+        error = e;
       });
+      this.model.set(this.key, this.getValue(), options);
 
       if (error) return error;
     },

diff --git a/test/distribution.html b/test/distribution.html
@@ -18,7 +18,7 @@
     <script src="lib/jquery-ui/jquery-ui-1.8.14.custom.min.js"></script>
 
     <script src="lib/underscore-1.4.4.js"></script>
-    <script src="lib/backbone-0.9.2.min.js"></script>
+    <script src="lib/backbone-0.9.10.js"></script>
     <script src="lib/backbone-deep-model.js"></script>
     <script src="lib/handlebars-1.0.rc.2.js"></script>
 

diff --git a/test/editors.js b/test/editors.js
@@ -88,7 +88,7 @@ module('Base');
       key: 'title'
     }).render();
 
-    var err = editor.commit();
+    var err = editor.commit({ validate: true });
 
     equal(err, 'ERROR');
   });
@@ -1010,10 +1010,10 @@ module('Select', {
     test('Options as a new collection (needs to be fetched)', function() {
         OptionCollection.prototype.sync = function(method, collection, options) {
             if (method === 'read') {
-                options.success([
+                options.success(collection, [
                     { id: 'kid1', name: 'Barbara' },
                     { id: 'kid2', name: 'Phil' }
-                ]);
+                ], options);
             }
         };
 

diff --git a/test/index.html b/test/index.html
@@ -18,7 +18,7 @@
     <script src="lib/jquery-ui/jquery-ui-1.8.14.custom.min.js"></script>
 
     <script src="lib/underscore-1.4.4.js"></script>
-    <script src="lib/backbone-0.9.2.min.js"></script>
+    <script src="lib/backbone-0.9.10.js"></script>
     <script src="lib/backbone-deep-model.js"></script>
     <script src="lib/handlebars-1.0.rc.2.js"></script>