aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/require/browser.js
diff options
context:
space:
mode:
authorKruti Shah2012-06-20 15:12:48 -0700
committerKruti Shah2012-06-20 15:12:48 -0700
commit1fe1202ba87d6de9b0f0d8efee78f955c5350210 (patch)
tree26ff4c6c5a94accfd5801f124244d3eef152a5c7 /node_modules/montage/require/browser.js
parent1ce4bd7033a413c7697888e5712f278219d6d095 (diff)
parent782b66c783df4a9c36fa240cc77900e69b9130cf (diff)
downloadninja-1fe1202ba87d6de9b0f0d8efee78f955c5350210.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
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