Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/io/system/ninjalibrary.json

2 files changed, 6 insertions, 16 deletions

diff --git a/node_modules/montage/require/browser.js b/node_modules/montage/require/browser.js
index f4a11d97..a6a8af5a 100755
--- a/node_modules/montage/require/browser.js
+++ b/node_modules/montage/require/browser.js
@@ -82,7 +82,7 @@ if (global.navigator && global.navigator.userAgent.indexOf("Firefox") >= 0) {
 }
 
 var __FILE__String = "__FILE__",
-    DoubleUnderscoreString = "__"
+    DoubleUnderscoreString = "__",
     globalEvalConstantA = "(function ",
     globalEvalConstantB = "(require, exports, module) {",
     globalEvalConstantC = "//*/\n})\n//@ sourceURL=";
diff --git a/node_modules/montage/require/require.js b/node_modules/montage/require/require.js
index 4ea8a46d..eaa2d9fc 100755
--- a/node_modules/montage/require/require.js
+++ b/node_modules/montage/require/require.js
@@ -372,17 +372,9 @@
     function normalizeDependency(dependency, config, name) {
         config = config || {};
         if (typeof dependency === "string") {
-            if (dependency.indexOf("@") >= 0) {
-                var parts = dependency.split("@");
-                dependency = {
-                    name: parts[0] || name,
-                    version: parts[1]
-                };
-            } else {
-                dependency = {
-                    location: dependency
-                };
-            }
+            dependency = {
+                location: dependency
+            };
         }
         // if the named dependency has already been found at another
         // location, refer to the same eventual instance
@@ -457,7 +449,7 @@
         var overlay = description.overlay || {};
         Require.overlays.forEach(function (engine) {
             if (overlay[engine]) {
-                layer = overlay[engine];
+                var layer = overlay[engine];
                 for (var name in layer) {
                     description[name] = layer[name];
                 }
@@ -468,9 +460,7 @@
         // directories
         description.directories = description.directories || {};
         description.directories.lib =
-            description.directories.lib === void 0
-            ? "."
-            : description.directories.lib;
+            description.directories.lib === void 0 ? "." : description.directories.lib;
         var lib = description.directories.lib;
         // lib
         config.lib = URL.resolve(location, "./" + lib);