Merge pull request #6765 from edx/andya/requirejs-in-lms

Add RequireJS to the LMS
2015-01-27 17:57:33 -05:00
parent f6d0918555 b8184d188f
commit 6201af652b
23 changed files with 740 additions and 35 deletions
--- a/cms/static/build-studio.js
+++ b/cms/static/build-studio.js
@@ -61,7 +61,7 @@
         * As of 2.1.10, mainConfigFile can be an array of values, with the last
         * value's config take precedence over previous values in the array.
         */
-        mainConfigFile: 'require-config.js',
+        mainConfigFile: 'require-config-studio.js',
        /**
         * Set paths for modules. If relative paths, set relative to baseUrl above.
         * If a special value of "empty:" is used for the path value, then that
--- a/cms/static/require-config-studio.js
+++ b/cms/static/require-config-studio.js