From f70891b5c0670429d077e2b8282dfde79e0dbd5c Mon Sep 17 00:00:00 2001 From: cahrens Date: Thu, 28 May 2015 12:22:33 -0400 Subject: [PATCH] Add support for edX namespaced define. --- common/static/js/vendor/requirejs/text.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/common/static/js/vendor/requirejs/text.js b/common/static/js/vendor/requirejs/text.js index 4c311edceb..1e5cf41f4f 100644 --- a/common/static/js/vendor/requirejs/text.js +++ b/common/static/js/vendor/requirejs/text.js @@ -8,7 +8,10 @@ define, window, process, Packages, 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'; var text, fs, Cc, Ci, xpcIsWindows, @@ -207,7 +210,7 @@ define(['module'], function (module) { if (buildMap.hasOwnProperty(moduleName)) { var content = text.jsEscape(buildMap[moduleName]); write.asModule(pluginName + "!" + moduleName, - "define(function () { return '" + + "namespaced_define(function () { return '" + content + "';});\n"); }