Commit f70891b5 by cahrens

Add support for edX namespaced define.

parent 0ddf2647
...@@ -8,7 +8,10 @@ ...@@ -8,7 +8,10 @@
define, window, process, Packages, define, window, process, Packages,
java, location, Components, FileUtils */ java, location, Components, FileUtils */
define(['module'], function (module) { // Added by edX: we namespace requirejs and its associated functions.
var namespaced_define = window.define !== undefined ? define : RequireJS.define;
namespaced_define(['module'], function (module) {
'use strict'; 'use strict';
var text, fs, Cc, Ci, xpcIsWindows, var text, fs, Cc, Ci, xpcIsWindows,
...@@ -207,7 +210,7 @@ define(['module'], function (module) { ...@@ -207,7 +210,7 @@ define(['module'], function (module) {
if (buildMap.hasOwnProperty(moduleName)) { if (buildMap.hasOwnProperty(moduleName)) {
var content = text.jsEscape(buildMap[moduleName]); var content = text.jsEscape(buildMap[moduleName]);
write.asModule(pluginName + "!" + moduleName, write.asModule(pluginName + "!" + moduleName,
"define(function () { return '" + "namespaced_define(function () { return '" +
content + content +
"';});\n"); "';});\n");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment