backbone-promises
Advanced tools
Comparing version 0.2.7 to 0.2.8
11
index.js
@@ -1,2 +0,2 @@ | ||
var Backbone = require('backbone'); | ||
var Backbone = require('backdash'); | ||
var debug = require('debug')('backbone-promises'); | ||
@@ -101,7 +101,4 @@ var whenLib = require('when'); | ||
}; | ||
if (opt.promise) { | ||
opt.promise = opt.promise.yield(promise); | ||
} else { | ||
opt.promise = promise; | ||
} | ||
opt.promise = promise; | ||
return opt; | ||
@@ -113,2 +110,2 @@ }, | ||
Backbone.Promises = module.exports = Promises; | ||
Backbone.Promises = module.exports = Promises; |
{ | ||
"name": "backbone-promises", | ||
"version": "0.2.7", | ||
"version": "0.2.8", | ||
"description": "Adds Promises/A+ support to backbone model and collection", | ||
@@ -19,12 +19,14 @@ "main": "index.js", | ||
"devDependencies": { | ||
"mocha": "~1.18", | ||
"backbone-db": "~0.4", | ||
"chai": "~1.9" | ||
"backbone-db": "^0.5.3", | ||
"backbone-db-local": "^0.5.2", | ||
"chai": "^1.9.1", | ||
"mocha": "^1.21.3" | ||
}, | ||
"dependencies": { | ||
"backbone": "~1.1.0", | ||
"backdash": "^1.1.2-2.4.1", | ||
"debug": "~0.7.2", | ||
"when": "~3.1", | ||
"lodash": "~2.4.1" | ||
"lodash": "~2.4.1", | ||
"when": "^3.1.0" | ||
} | ||
} |
var assert = require('assert'); | ||
var Model = require('../').Model; | ||
var Backbone = require('backbone'); | ||
var Db = require('backbone-db'); | ||
var Backbone = require('backdash'); | ||
var Db = require('backbone-db-local'); | ||
var Deferred = require('../'); | ||
@@ -82,2 +82,2 @@ | ||
}); | ||
}); | ||
}); |
var assert = require('assert'); | ||
var Backbone = require('backbone'); | ||
var Backbone = require('backdash'); | ||
var Model = require('../').Model; | ||
var Collection = require('../').Collection; | ||
var Db = require('backbone-db'); | ||
var Db = require('backbone-db-local'); | ||
var debug = require('debug')('promises'); | ||
@@ -10,3 +10,3 @@ var when = require('../').when; | ||
var expect = require('chai').expect | ||
var monitor = require('when/monitor/console'); | ||
// var monitor = require('when/monitor/console'); | ||
@@ -65,3 +65,3 @@ var MyModel = Model.extend({ | ||
}, {wait: true}); | ||
Backbone.Promises.when.join(m1, m2, m3).done(function(values) { | ||
when.join(m1, m2, m3).done(function(values) { | ||
assert(values[0].get('data') == "xyz"); | ||
@@ -111,2 +111,2 @@ assert(values[1].get('data') == "zyx"); | ||
}); | ||
}); |
var assert = require('assert'); | ||
var Backbone = require('backbone'); | ||
var Backbone = require('backdash'); | ||
var Model = require('../').Model; | ||
var Collection = require('../').Collection; | ||
var Db = require('backbone-db'); | ||
var Db = require('backbone-db-local'); | ||
var debug = require('debug')('deferred'); | ||
@@ -96,3 +96,3 @@ var when = require('when'); | ||
} | ||
}); | ||
}).done(function() {},function() {}); // catch em | ||
}, | ||
@@ -117,5 +117,5 @@ error: function(err) { | ||
it('Should be destroyable.', function(t) { | ||
it('Should be destroyable.', function() { | ||
var m = new MyModel(); | ||
m.save({ | ||
return m.save({ | ||
id: 123, | ||
@@ -126,3 +126,5 @@ asd: "asd" | ||
return m.destroy().then(function() { | ||
return m.fetch().then(t, | ||
return m.fetch().then(function() { | ||
assett(false); | ||
}, | ||
function(err) { | ||
@@ -133,5 +135,3 @@ assert(err instanceof(Error), 'It should return an error when not found'); | ||
}) | ||
}).done(function() { | ||
t(); | ||
}, t); | ||
}); | ||
}); | ||
@@ -175,2 +175,2 @@ | ||
}); | ||
}); | ||
}); |
20512
15
555
5
4
+ Addedbackdash@^1.1.2-2.4.1
+ Addedbackdash@1.1.2-2.4.1(transitive)
+ Addedlodash@2.4.1(transitive)
+ Addedwhen@3.7.8(transitive)
- Removedwhen@3.1.0(transitive)
Updatedwhen@^3.1.0