diff options
author | Valerio Virgillito | 2012-06-17 22:31:44 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-17 22:31:44 -0700 |
commit | 8fe92b94ce5e1e2857d088752d94e19db7e3d8a8 (patch) | |
tree | d84807aae0b974b5200050972dd94da6066e363b /node_modules/montage/require/browser.js | |
parent | e570fc8518cf03dd03c15982edcf17c5ba0a293d (diff) | |
download | ninja-8fe92b94ce5e1e2857d088752d94e19db7e3d8a8.tar.gz |
montage v11 merge into ninja
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/require/browser.js')
-rwxr-xr-x | node_modules/montage/require/browser.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/node_modules/montage/require/browser.js b/node_modules/montage/require/browser.js index a6a8af5a..1b4029ad 100755 --- a/node_modules/montage/require/browser.js +++ b/node_modules/montage/require/browser.js | |||
@@ -17,7 +17,7 @@ Require.getLocation = function() { | |||
17 | return URL.resolve(window.location, "."); | 17 | return URL.resolve(window.location, "."); |
18 | }; | 18 | }; |
19 | 19 | ||
20 | Require.overlays = ["browser", "montage"]; | 20 | Require.overlays = ["window", "browser", "montage"]; |
21 | 21 | ||
22 | // Due to crazy variabile availability of new and old XHR APIs across | 22 | // Due to crazy variabile availability of new and old XHR APIs across |
23 | // platforms, this implementation registers every known name for the event | 23 | // platforms, this implementation registers every known name for the event |
@@ -116,8 +116,6 @@ Require.Compiler = function (config) { | |||
116 | // module.factory = new Function("require", "exports", "module", module.text + "\n//*/"+sourceURLComment); | 116 | // module.factory = new Function("require", "exports", "module", module.text + "\n//*/"+sourceURLComment); |
117 | 117 | ||
118 | module.factory.displayName = displayName; | 118 | module.factory.displayName = displayName; |
119 | |||
120 | return module; | ||
121 | } | 119 | } |
122 | }; | 120 | }; |
123 | 121 | ||