Use lodash.noConflict for underscore
This commit is contained in:
parent
865789d49e
commit
c7d66377d0
|
@ -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
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/*global define */
|
||||
define('underscore', ['lodash'], function (_) {
|
||||
return _;
|
||||
define(['lodash'], function (_) {
|
||||
return _.noConflict();
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue
Block a user