Skip to content

enhancement/929: remove core require mappings "coreJS" "coreViews" #930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
moloko merged 2 commits into from
Feb 16, 2016
Merged

enhancement/929: remove core require mappings "coreJS" "coreViews" #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
162fbd4
enhancement/929: use mapping instead of explicit paths
oliverfoster Jan 31, 2016
20c43f4
enhancement/929: remap client side
oliverfoster Jan 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -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'
}
}
});
22 changes: 19 additions & 3 deletions src/core/js/scriptLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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([
{
Expand All @@ -20,7 +36,7 @@
]);
}

//3. Load adapt
//4. Load adapt
function loadAdapt() {
switch (IE) {
case 8: case 9:
Expand All @@ -47,7 +63,7 @@
},
{
load: "libraries/require.js",
complete: loadJQuery
complete: setupRequireJS
}
]);

Expand Down