From 306e20ecab12f27e0bd500f7a306705646aa8eb3 Mon Sep 17 00:00:00 2001
From: Chris Baynes <binaryexp+github@gmail.com>
Date: Thu, 5 Jul 2012 15:45:01 +0200
Subject: [PATCH] Trigger error even when providing a callback.

---
 backbone.js   | 7 ++-----
 test/model.js | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/backbone.js b/backbone.js
index 15a74d10..dbb9fb4b 100644
--- a/backbone.js
+++ b/backbone.js
@@ -1393,11 +1393,8 @@
   Backbone.wrapError = function(onError, originalModel, options) {
     return function(model, resp) {
       resp = model === originalModel ? resp : model;
-      if (onError) {
-        onError(originalModel, resp, options);
-      } else {
-        originalModel.trigger('error', originalModel, resp, options);
-      }
+      if (onError) onError(originalModel, resp, options);
+      originalModel.trigger('error', originalModel, resp, options);
     };
   };
 
diff --git a/test/model.js b/test/model.js
index 8689d975..574f5759 100644
--- a/test/model.js
+++ b/test/model.js
@@ -776,7 +776,7 @@ $(document).ready(function() {
     model.set({a: true});
   });
 
-  test("Backbone.wrapError triggers `'error'`", 12, function() {
+  test("Backbone.wrapError triggers `'error'`", 18, function() {
     var resp = {};
     var options = {};
     var model = new Backbone.Model();