Updating npm version, rebuilding demo

ZeroarcSoftware · May 29, 2015 · b2ebbd8 · b2ebbd8
1 parent 11ab7cb
commit b2ebbd8
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 35 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "carbondream",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Reactjs web annotation engine",
   "homepage": "http://carbondream.zeroarc.com/",
   "main": "dist/entry.js",
@@ -28,15 +28,14 @@
   "bugs": {
     "url": "https://github.com/ZeroarcSoftware/carbondream/issues"
   },
-  "homepage": "https://github.com/ZeroarcSoftware/carbondream",
   "devDependencies": {
     "babel": "^5.4.7",
-    "babelify": "^6.1.1",
-    "browserify": "^10.2.1",
+    "babelify": "^6.1.2",
+    "browserify": "^10.2.3",
     "watchify": "^3.2.1"
   },
   "dependencies": {
-    "classnames": "^1.2.2",
+    "classnames": "^2.1.2",
     "font-awesome": "^4.3.0",
     "immutable": "^3.7.3",
     "react": "^0.13.3",

diff --git a/test/index.js b/test/index.js
@@ -49,7 +49,7 @@ process.nextTick = function (fun) {
         }
     }
     queue.push(new Item(fun, args));
-    if (!draining) {
+    if (queue.length === 1 && !draining) {
         setTimeout(drainQueue, 0);
     }
 };
@@ -97,43 +97,49 @@ process.umask = function() { return 0; };
   http://jedwatson.github.io/classnames
 */
 
-function classNames() {
-	var classes = '';
-	var arg;
+(function () {
+	'use strict';
 
-	for (var i = 0; i < arguments.length; i++) {
-		arg = arguments[i];
-		if (!arg) {
-			continue;
-		}
+	function classNames () {
+
+		var classes = '';
+
+		for (var i = 0; i < arguments.length; i++) {
+			var arg = arguments[i];
+			if (!arg) continue;
+
+			var argType = typeof arg;
+
+			if ('string' === argType || 'number' === argType) {
+				classes += ' ' + arg;
+
+			} else if (Array.isArray(arg)) {
+				classes += ' ' + classNames.apply(null, arg);
 
-		if ('string' === typeof arg || 'number' === typeof arg) {
-			classes += ' ' + arg;
-		} else if (Object.prototype.toString.call(arg) === '[object Array]') {
-			classes += ' ' + classNames.apply(null, arg);
-		} else if ('object' === typeof arg) {
-			for (var key in arg) {
-				if (!arg.hasOwnProperty(key) || !arg[key]) {
-					continue;
+			} else if ('object' === argType) {
+				for (var key in arg) {
+					if (arg.hasOwnProperty(key) && arg[key]) {
+						classes += ' ' + key;
+					}
 				}
-				classes += ' ' + key;
 			}
 		}
+
+		return classes.substr(1);
 	}
-	return classes.substr(1);
-}
 
-// safely export classNames for node / browserify
-if (typeof module !== 'undefined' && module.exports) {
-	module.exports = classNames;
-}
+	if (typeof define === 'function' && typeof define.amd === 'object' && define.amd) {
+		// AMD. Register as an anonymous module.
+		define(function () {
+			return classNames;
+		});
+	} else if (typeof module !== 'undefined' && module.exports) {
+		module.exports = classNames;
+	} else {
+		window.classNames = classNames;
+	}
 
-// safely export classNames for RequireJS
-if (typeof define !== 'undefined' && define.amd) {
-	define('classnames', [], function() {
-		return classNames;
-	});
-}
+}());
 
 },{}],3:[function(require,module,exports){
 /**