Merge pull request #930 from adaptlearning/enhancement/929

enhancement/929: remove core require mappings "coreJS" "coreViews"
adaptlearning · Feb 16, 2016 · 6045dc9 · 6045dc9
2 parents 0ae5449 + 20c43f4
commit 6045dc9
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 9 deletions.
diff --git a/config.js b/config.js
@@ -10,11 +10,6 @@ require.config({
         inview: 'core/js/libraries/inview',
         a11y: 'core/js/libraries/jquery.a11y',
         scrollTo: 'core/js/libraries/scrollTo',
-        coreJS: 'core/js',
-        coreViews: 'core/js/views',
-        coreModels: 'core/js/models',
-        coreCollections: 'core/js/collections',
-        coreHelpers: 'core/js/helpers',
         templates: 'templates/templates'
     },
     shim: {
@@ -65,5 +60,14 @@ require.config({
     ],
     exclude: [
         'jquery'
-    ]
+    ],
+    map: {
+        '*': {
+            coreJS: 'core/js',
+            coreViews: 'core/js/views',
+            coreModels: 'core/js/models',
+            coreCollections: 'core/js/collections',
+            coreHelpers: 'core/js/helpers'
+        }
+    }
 });
diff --git a/src/core/js/scriptLoader.js b/src/core/js/scriptLoader.js
@@ -7,8 +7,24 @@
         }
         return false;
     })();
+
+    //2. Setup require for old style module declarations
+    function setupRequireJS() {
+        requirejs.config({
+            map: {
+                '*': {
+                    coreJS: 'core/js',
+                    coreViews: 'core/js/views',
+                    coreModels: 'core/js/models',
+                    coreCollections: 'core/js/collections',
+                    coreHelpers: 'core/js/helpers'
+                }
+            }
+        });
+        loadJQuery();
+    }
 
-    //2. Load jquery
+    //3. Load jquery
     function loadJQuery() {
         Modernizr.load([
             {
@@ -20,7 +36,7 @@
         ]);
     }
 
-    //3. Load adapt
+    //4. Load adapt
     function loadAdapt() {
         switch (IE) {
         case 8: case 9:
@@ -47,7 +63,7 @@
         },
         {
             load: "libraries/require.js",
-            complete: loadJQuery
+            complete: setupRequireJS
         }
     ]);