Merge pull request #18 from Infowatch/master

proper commonjs; upgrade deps

Backbone.Undo.js

@@ -15,7 +15,10 @@
 		define(["underscore", "backbone"], factory);
 	} else if (typeof exports !== 'undefined') {
 		// CommonJS support
-		module.exports = factory;
+		module.exports = factory(
+			require("underscore"),
+			require("backbone")
+		);
 	} else {
 		// Non-modular execution
 		factory(_, Backbone);
@@ -825,6 +828,6 @@
 		}
 	})
 
-	Backbone.UndoManager = UndoManager;
+	return Backbone.UndoManager = UndoManager;
 
 });

bower.json

@@ -1,5 +1,6 @@
 {
   "name": "Backbone.Undo.js",
+  "version": "0.2.5",
   "main": "Backbone.Undo.js",
   "license": "MIT license",
   "homepage": "http://backbone.undojs.com/",
@@ -14,8 +15,8 @@
     "Backbone", "undo"
   ],
   "dependencies" :{
-    "underscore": "~1.4.4",
+    "underscore": "1.4.4 - 1.8.3",
-    "backbone": "~1.0.0"
+    "backbone": "1.0.0 - 1.2.1"
   },
   "ignore": [
     "Tests",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "backbone-undo",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "A simple Backbone undo-manager for simple apps",
   "homepage": "http://backbone.undojs.com",
   "keywords": "backbone, undo",
@@ -20,7 +20,7 @@
     "url": "https://github.com/osartun/Backbone.Undo.js/issues"
   },
   "dependencies": {
-    "backbone": "~1.0.0",
+    "backbone": "1.0.0 - 1.2.1",
-    "underscore": "~1.4.4"
+    "underscore": "1.4.4 - 1.8.3"
   }
 }