Fix #1365 - Destroy: new models execute success callback.

jashkenas · Jun 16, 2012 · b6b9ec7 · b6b9ec7
1 parent 54ec530
commit b6b9ec7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/backbone.js b/backbone.js
@@ -397,24 +397,24 @@
       var model = this;
       var success = options.success;
 
-      var triggerDestroy = function() {
+      var destroy = function() {
         model.trigger('destroy', model, model.collection, options);
       };
 
-      if (this.isNew()) {
-        triggerDestroy();
-        return false;
-      }
-
       options.success = function(resp) {
-        if (options.wait) triggerDestroy();
+        if (options.wait || model.isNew()) destroy();
         if (success) success(model, resp, options);
-        model.trigger('sync', model, resp, options);
+        if (!model.isNew()) model.trigger('sync', model, resp, options);
       };
 
+      if (this.isNew()) {
+        options.success();
+        return false;
+      }
+
       options.error = Backbone.wrapError(options.error, model, options);
       var xhr = this.sync('delete', this, options);
-      if (!options.wait) triggerDestroy();
+      if (!options.wait) destroy();
       return xhr;
     },
 

diff --git a/test/model.js b/test/model.js
@@ -840,4 +840,11 @@ $(document).ready(function() {
     model.destroy();
   });
 
+  test("#1365 - Destroy: New models execute success callback.", 2, function() {
+    new Backbone.Model()
+    .on('sync', function() { ok(false); })
+    .on('destroy', function(){ ok(true); })
+    .destroy({ success: function(){ ok(true); }});
+  });
+
 });