diff --git a/backbone.subset.js b/backbone.subset.js index e3bb6ce..c166094 100644 --- a/backbone.subset.js +++ b/backbone.subset.js @@ -55,7 +55,7 @@ this.beforeInitialize.apply(this, arguments); } - if (!options.no_reset) { + if (options.reset_parent) { this._reset(); this.reset(models || parent.models, {silent: true}); } else { @@ -331,7 +331,7 @@ */ Subset._updateModelMembership = function (model, options) { var hasId = !model.id - , alreadyInSubset = this._byCid[model.cid] || (hasId && this._byId[model.id]); + , alreadyInSubset = this._byId[model.cid] || (hasId && this._byId[model.id]); if (this.sieve(model)) { if (!alreadyInSubset) { diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..05180ad --- /dev/null +++ b/bower.json @@ -0,0 +1,7 @@ +{ + "name": "Backbone.Subset", + "version": "0.1.1", + "dependencies": {"backbone": "~1.1.0", "underscore": "~1.5.2"}, + "main": "./backbone.subset", + "ignore": ["Makefile", "test", "Readme.md"] +} diff --git a/package.json b/package.json index 4652ef6..d5bfe00 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,6 @@ "Philip Roberts ", "Steven Lindberg "], "repository": {"type": "git", "url": "git://github.com/masylum/Backbone.Subset.git"}, - "devDependencies": {"backbone": "0.5.3", "underscore": "1.3.3", "mocha": "*"}, + "devDependencies": {"backbone": "1.1.0", "underscore": "1.5.2", "mocha": "*"}, "main": "./backbone.subset" }