Merge pull request #6544 from edx/will/requirejs-optimizer-lms

Add RequireJS and RequireJS Optimizer configuration to the LMS
2015-01-21 15:23:35 -05:00
parent 872870ea18 1d6fceda50
commit 1eaf84a443
23 changed files with 735 additions and 19 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