set _changing = false only if !alreadyChanging

joelturnbull · Nov 9, 2011 · 20a2e34 · 20a2e34
1 parent f9ae1a1
commit 20a2e34
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/backbone.js b/backbone.js
@@ -211,8 +211,10 @@
       }
 
       // Fire the `"change"` event, if the model has been changed.
-      if (!alreadyChanging && !options.silent && this._changed) this.change(options);
-      this._changing = false;
+      if (!alreadyChanging) {
+        if (!options.silent && this._changed) this.change(options);
+        this._changing = false;
+      }
       return this;
     },
 

diff --git a/test/model.js b/test/model.js
@@ -449,4 +449,13 @@ $(document).ready(function() {
     a.set({state: 'hello'});
   });
 
+  test("Model: Multiple nested calls to set", function() {
+    var model = new Backbone.Model({});
+    model.bind('change', function() {
+      model.set({b: 1});
+      model.set({a: 1});
+    })
+    .set({a: 1});
+  });
+
 });