From 562b73db333ecdfd98f5425e7683183724aa7820 Mon Sep 17 00:00:00 2001 From: Vladislav Botvin Date: Tue, 30 Jun 2015 14:37:09 +0300 Subject: [PATCH 1/5] proper commonjs --- Backbone.Undo.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Backbone.Undo.js b/Backbone.Undo.js index 993c6bb..9bc0e05 100644 --- a/Backbone.Undo.js +++ b/Backbone.Undo.js @@ -15,7 +15,9 @@ define(["underscore", "backbone"], factory); } else if (typeof exports !== 'undefined') { // CommonJS support - module.exports = factory; + var _ = require("underscore"); + var Backbone = require("backbone"); + module.exports = factory(_, Backbone); } else { // Non-modular execution factory(_, Backbone); @@ -825,6 +827,6 @@ } }) - Backbone.UndoManager = UndoManager; + return Backbone.UndoManager = UndoManager; }); From b88e2fe864451011e5461143520f0fc817727144 Mon Sep 17 00:00:00 2001 From: Vladislav Botvin Date: Tue, 30 Jun 2015 14:37:49 +0300 Subject: [PATCH 2/5] allow to use latest deps --- bower.json | 4 ++-- package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bower.json b/bower.json index f9f4502..6667879 100644 --- a/bower.json +++ b/bower.json @@ -14,8 +14,8 @@ "Backbone", "undo" ], "dependencies" :{ - "underscore": "~1.4.4", - "backbone": "~1.0.0" + "underscore": "1.4.4 - 1.8.3", + "backbone": "1.0.0 - 1.2.1" }, "ignore": [ "Tests", diff --git a/package.json b/package.json index 156290f..f6dd065 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "url": "https://github.com/osartun/Backbone.Undo.js/issues" }, "dependencies": { - "backbone": "~1.0.0", - "underscore": "~1.4.4" + "backbone": "1.0.0 - 1.2.1", + "underscore": "1.4.4 - 1.8.3" } } From 2a082975d967f03aafaa84424cf1bcbc4be0cd6d Mon Sep 17 00:00:00 2001 From: Vladislav Botvin Date: Tue, 30 Jun 2015 14:38:05 +0300 Subject: [PATCH 3/5] bump 0.2.4 --- bower.json | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 6667879..6e109f2 100644 --- a/bower.json +++ b/bower.json @@ -1,5 +1,6 @@ { "name": "Backbone.Undo.js", + "version": "0.2.4", "main": "Backbone.Undo.js", "license": "MIT license", "homepage": "http://backbone.undojs.com/", diff --git a/package.json b/package.json index f6dd065..67585b0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "backbone-undo", - "version": "0.2.3", + "version": "0.2.4", "description": "A simple Backbone undo-manager for simple apps", "homepage": "http://backbone.undojs.com", "keywords": "backbone, undo", From cea75b85ecd37312dc4e1c9d99b5f0babeac69e7 Mon Sep 17 00:00:00 2001 From: Vladislav Botvin Date: Tue, 30 Jun 2015 14:59:45 +0300 Subject: [PATCH 4/5] fix broken tests --- Backbone.Undo.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Backbone.Undo.js b/Backbone.Undo.js index 9bc0e05..241ed91 100644 --- a/Backbone.Undo.js +++ b/Backbone.Undo.js @@ -15,9 +15,10 @@ define(["underscore", "backbone"], factory); } else if (typeof exports !== 'undefined') { // CommonJS support - var _ = require("underscore"); - var Backbone = require("backbone"); - module.exports = factory(_, Backbone); + module.exports = factory( + require("underscore"), + require("backbone") + ); } else { // Non-modular execution factory(_, Backbone); From 5a66993e84ebe2b8e937c7bf00f5fcac0ea89c9a Mon Sep 17 00:00:00 2001 From: Vladislav Botvin Date: Tue, 30 Jun 2015 15:00:22 +0300 Subject: [PATCH 5/5] bump 0.2.5 --- bower.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 6e109f2..49bc2b2 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "Backbone.Undo.js", - "version": "0.2.4", + "version": "0.2.5", "main": "Backbone.Undo.js", "license": "MIT license", "homepage": "http://backbone.undojs.com/", diff --git a/package.json b/package.json index 67585b0..8c51f1b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "backbone-undo", - "version": "0.2.4", + "version": "0.2.5", "description": "A simple Backbone undo-manager for simple apps", "homepage": "http://backbone.undojs.com", "keywords": "backbone, undo",