aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/require/browser.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-20 16:48:34 -0700
committerJose Antonio Marquez2012-06-20 16:48:34 -0700
commit4eff115126ab946c5852d787fd596e07b156c9a5 (patch)
treef7d45b260f2fb5ba5dc4d1879076ca032d5ae2e6 /node_modules/montage/require/browser.js
parent7615da5c6ba54bd082eac4b8a6d9196084e5c590 (diff)
parent392a559e90357d48c910a07617261483b2b45476 (diff)
downloadninja-4eff115126ab946c5852d787fd596e07b156c9a5.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'node_modules/montage/require/browser.js')
-rwxr-xr-xnode_modules/montage/require/browser.js4
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
20Require.overlays = ["browser", "montage"]; 20Require.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