Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts:
	.gitignore
	js/ninja.reel/ninja.js

3 files changed, 541 insertions, 740 deletions

diff --git a/node_modules/montage/require/browser.js b/node_modules/montage/require/browser.js
index 9094397b..e249d355 100755
--- a/node_modules/montage/require/browser.js
+++ b/node_modules/montage/require/browser.js
@@ -5,102 +5,29 @@
  </copyright> */
 bootstrap("require/browser", function (require) {
 
-var CJS = require("require/require");
+var Require = require("require/require");
 var Promise = require("core/promise").Promise;
-var URL = require("core/url");
+var URL = require("core/mini-url");
 
 var global = typeof global !== "undefined" ? global : window;
 
-CJS.pwd = function() {
+Require.getLocation = function() {
     return URL.resolve(window.location, ".");
 };
 
-function ScriptLoader(options) {
-    var pendingDefinitions = [];
-    var pendingScripts = {};
-
-    window.define._subscribe(function(definition) {
-        if (definition.path && pendingScripts[definition.path]) {
-            pendingDefinitions.push(definition);
-        } else {
-            console.log("Ignoring "+definition.path + " (possibly concurrent )")
-        }
-    });
-
-    return function(url, callback) {
-        if (!callback) {
-            CJS.console.warn("ScriptLoader does not support synchronous loading ("+url+").");
-            return null;
-        }
-
-        // Firefox does not fire script tag events correct for scripts loaded from file://
-        // This only runs if loaded from file://
-        // TODO: make a configuration option to run only in debug mode?
-        if (HACK_checkFirefoxFileURL(url)) {
-            callback(null);
-            return;
-        }
-
-        var normalUrl = URL.resolve(url, "");
-        pendingScripts[normalUrl] = true;
-
-        var script = document.createElement("script");
-        script.onload = function() {
-            if (pendingDefinitions.length === 0) {
-                // Script tags seem to fire onload even for 404 status code in some browsers (Chrome, Safari).
-                // CJS.console.warn("No pending script definitions.");
-            } else if (pendingDefinitions.length > 1) {
-                CJS.console.warn("Support for multiple script definitions per file is not yet implemented.");
-            }
-            var definition = pendingDefinitions.pop();
-            if (definition) {
-                finish(options.compiler(definition))
-            } else {
-                finish(null);
-            }
-        }
-        script.onerror = function() {
-            if (pendingDefinitions.length !== 0) {
-                CJS.console.warn("Extra pending script definitions!");
-            }
-            finish(null);
-        }
-        script.src = url;
-        document.getElementsByTagName("head")[0].appendChild(script);
-
-        function finish(result) {
-            pendingScripts[normalUrl] = false;
-            script.parentNode.removeChild(script);
-            callback(result);
-        }
-    }
-}
-
-function HACK_checkFirefoxFileURL(url) {
-    if (window.navigator.userAgent.indexOf("Firefox") >= 0) {
-        var protocol = url.match(/^([a-zA-Z]+:\/\/)?/)[1];
-        if (protocol === "file://" || (!protocol && window.location.protocol === "file:")) {
-            try {
-                var req = new XMLHttpRequest();
-                req.open("GET", url, false);
-                req.send();
-                return !xhrSuccess(req);
-            } catch (e) {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-CJS.overlays = ["browser"];
+Require.overlays = ["browser", "montage"];
 
 // Due to crazy variabile availability of new and old XHR APIs across
 // platforms, this implementation registers every known name for the event
 // listeners.  The promise library ascertains that the returned promise
 // is resolved only by the first event.
 // http://dl.dropbox.com/u/131998/yui/misc/get/browser-capabilities.html
-CJS.read = function (url, options) {
+Require.read = function (url) {
+
+    if (URL.resolve(window.location, url).indexOf("file:") === 0) {
+        throw new Error("XHR does not function for file: protocol");
+    }
+
     var request = new XMLHttpRequest();
     var response = Promise.defer();
 
@@ -108,7 +35,7 @@ CJS.read = function (url, options) {
         if (xhrSuccess(request)) {
             response.resolve(request.responseText);
         } else {
-            response.reject("Can't XHR " + JSON.stringify(url));
+            onerror();
         }
     }
 
@@ -118,8 +45,7 @@ CJS.read = function (url, options) {
 
     try {
         request.open("GET", url, true);
-        options && options.overrideMimeType && request.overrideMimeType &&
-            request.overrideMimeType(options.overrideMimeType);
+        request.overrideMimeType("application/javascript");
         request.onreadystatechange = function () {
             if (request.readyState === 4) {
                 onload();
@@ -135,32 +61,6 @@ CJS.read = function (url, options) {
     return response.promise;
 };
 
-function XHRLoader(options) {
-    return function(url, callback) {
-        CJS.read(url, {
-            overrideMimeType: "application/javascript"
-        }).then(function (content) {
-            if (/^\s*define\s*\(/.test(content)) {
-                CJS.console.log("Detected async module definition, load with script loader instead.");
-                callback(null);
-            } else {
-                callback(options.compiler({ text : content, path : url }));
-            }
-        }, function (error) {
-            console.warn(error);
-            callback(null);
-        });
-    }
-}
-
-function CachingXHRLoader(options) {
-    return CJS.CachingLoader(options, XHRLoader(options));
-}
-
-function CachingScriptLoader(options) {
-    return CJS.CachingLoader(options, ScriptLoader(options));
-}
-
 // Determine if an XMLHttpRequest was successful
 // Some versions of WebKit return 0 for successful file:// URLs
 function xhrSuccess(req) {
@@ -177,63 +77,36 @@ if (global.navigator && global.navigator.userAgent.indexOf("Firefox") >= 0) {
     globalEval = new Function("evalString", "return eval(evalString)");
 }
 
-CJS.BrowserCompiler = function(config) {
-    return function(def) {
-        if (def.factory)
-            return def;
+Require.Compiler = function (config) {
+    return function(module) {
+        if (module.factory || module.text === void 0)
+            return module;
 
         // Here we use a couple tricks to make debugging better in various browsers:
         // TODO: determine if these are all necessary / the best options
         // 1. name the function with something inteligible since some debuggers display the first part of each eval (Firebug)
-        // 2. append the "//@ sourceURL=path" hack (Safari, Chrome, Firebug)
+        // 2. append the "//@ sourceURL=location" hack (Safari, Chrome, Firebug)
         //  * http://pmuellr.blogspot.com/2009/06/debugger-friendly.html
         //  * http://blog.getfirebug.com/2009/08/11/give-your-eval-a-name-with-sourceurl/
         //      TODO: investigate why this isn't working in Firebug.
         // 3. set displayName property on the factory function (Safari, Chrome)
 
-        var displayName = "__FILE__"+def.path.replace(/\.\w+$|\W/g, "__");
-        var sourceURLComment = "\n//@ sourceURL="+def.path;
+        var displayName = "__FILE__"+module.location.replace(/\.\w+$|\W/g, "__");
 
-        def.factory = globalEval("(function "+displayName+"(require, exports, module) {"+def.text+"//*/\n})"+sourceURLComment);
+        try {
+            module.factory = globalEval("(function "+displayName+"(require, exports, module) {"+module.text+"//*/\n})"+"\n//@ sourceURL="+module.location);