github/backbone
1
1
Fork 0
mirror of https://github.com/jashkenas/backbone.git synced 2026-01-21 04:48:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Trigger error even when providing a callback.

Browse Source
This commit is contained in:
Chris Baynes
2012-07-05 15:45:01 +02:00
parent d8477f4b45
commit 306e20ecab
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backbone.js
View File

@@ -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);
};
};

2
test/model.js
View File

@@ -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();