Use lodash.noConflict for underscore

This commit is contained in:
JC Brand 2017-04-23 17:17:46 +00:00
parent 865789d49e
commit c7d66377d0
2 changed files with 3 additions and 4 deletions

View File

@ -175,8 +175,7 @@ require.config({
'*': {
'jquery': 'jquery.noconflict',
'backbone': 'backbone.noconflict',
'lodash': 'lodash.noconflict',
'underscore': 'lodash.noconflict'
'lodash': 'lodash.noconflict'
},
// '*.noconflict' wants the real module
// If this line was not here, there would

View File

@ -1,4 +1,4 @@
/*global define */
define('underscore', ['lodash'], function (_) {
return _;
define(['lodash'], function (_) {
return _.noConflict();
});