From 4176c65a93ff191715453e2c19580a7b3e2e4fdc Mon Sep 17 00:00:00 2001 From: Marc-Antoine Parent Date: Wed, 6 Aug 2014 07:56:39 -0400 Subject: [PATCH 1/4] Update backbone and underscore. _byCid not used anymore. --- backbone.subset.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backbone.subset.js b/backbone.subset.js index e3bb6ce..67b4d1a 100644 --- a/backbone.subset.js +++ b/backbone.subset.js @@ -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/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" } From 326181f249917d7289ed4f348ca96570da3ce71f Mon Sep 17 00:00:00 2001 From: Marc-Antoine Parent Date: Sun, 24 Aug 2014 16:40:29 -0400 Subject: [PATCH 2/4] add bower.json --- bower.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 bower.json diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..a221725 --- /dev/null +++ b/bower.json @@ -0,0 +1,7 @@ +{ + "name": "Backbone.Subset", + "version": "0.1.0", + "dependencies": {"backbone": "~1.1.0", "underscore": "~1.5.2"}, + "main": "./backbone.subset", + "ignore": ["Makefile", "test", "Readme.md"] +} From 63f48b55fcaa7a5002f0b9ed1648de01fa30e15f Mon Sep 17 00:00:00 2001 From: Marc-Antoine Parent Date: Sun, 21 Dec 2014 13:01:46 -0500 Subject: [PATCH 3/4] safer default --- backbone.subset.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backbone.subset.js b/backbone.subset.js index 67b4d1a..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 { From 781481d931f313a84399b142c8f7cb6680adb322 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Parent Date: Sun, 21 Dec 2014 13:20:25 -0500 Subject: [PATCH 4/4] version bump --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index a221725..05180ad 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "Backbone.Subset", - "version": "0.1.0", + "version": "0.1.1", "dependencies": {"backbone": "~1.1.0", "underscore": "~1.5.2"}, "main": "./backbone.subset", "ignore": ["Makefile", "test", "Readme.md"]