backbone-promises
Advanced tools
Comparing version 0.2.4 to 0.2.5
15
index.js
@@ -15,3 +15,2 @@ var Backbone = require('backbone'); | ||
if(!options && (typeof val === "object" || typeof val === "undefined")) { | ||
debug('wrapping val'); | ||
opt = val = Promises.wrap(val); | ||
@@ -24,3 +23,3 @@ } else { | ||
debug('Model validation failed'); | ||
opt.deferred.reject(this.validationError||new Error('validation failed')); | ||
opt.error.call(this, this, this.validationError||new Error('validation failed')); | ||
} | ||
@@ -66,6 +65,7 @@ return opt.promise; | ||
opt = opt || {}; | ||
var deferred = whenLib.defer(); | ||
var promise = deferred.promise; | ||
var success = opt.success; | ||
var error = opt.error; | ||
opt.success = function() { | ||
@@ -83,6 +83,7 @@ debug("resolving"); | ||
}; | ||
// if(!opt.deferred) { | ||
opt.deferred = deferred; | ||
opt.promise = deferred.promise; | ||
// } | ||
if(opt.promise) { | ||
opt.promise = opt.promise.yield(promise); | ||
} else { | ||
opt.promise = promise; | ||
} | ||
return opt; | ||
@@ -89,0 +90,0 @@ }, |
{ | ||
"name": "backbone-promises", | ||
"version": "0.2.4", | ||
"version": "0.2.5", | ||
"description": "Adds Promises/A+ support to backbone model and collection", | ||
@@ -20,3 +20,3 @@ "main": "index.js", | ||
"mocha": "~1.13.0", | ||
"backbone-db": "~0.4.0", | ||
"backbone-db": "~0.4", | ||
"chai": "~1.8.0" | ||
@@ -23,0 +23,0 @@ }, |
12885
376