diff options
author | Ananya Sen | 2012-06-20 15:20:04 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-20 15:20:04 -0700 |
commit | caa9683fd259307658f96190a5c5bd771126fbb8 (patch) | |
tree | 83983a8819487ce8b33f65f5d20e34af2df8dd26 /node_modules/montage/require/browser.js | |
parent | d852ea28dad399e84e8d5e69c0293500c30b59f1 (diff) | |
parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
download | ninja-caa9683fd259307658f96190a5c5bd771126fbb8.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
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 | ||