Switch from underscore to lodash, #659

This commit is contained in:
Torkel Ödegaard
2014-08-07 14:35:19 +02:00
parent c3a6ae1622
commit 23c9f973cc
58 changed files with 6844 additions and 1312 deletions

View File

@@ -1,6 +1,6 @@
define([
'mocks/dashboard-mock',
'underscore',
'lodash',
'services/filterSrv'
], function(dashboardMock, _) {
'use strict';
@@ -10,7 +10,7 @@ define([
var _dashboard;
beforeEach(module('grafana.services'));
beforeEach(module(function(){
beforeEach(module(function() {
_dashboard = dashboardMock.create();
}));

View File

@@ -8,8 +8,8 @@ require.config({
kbn: 'components/kbn',
settings: 'components/settings',
underscore: 'components/underscore.extended',
'underscore-src': '../vendor/underscore',
lodash: 'components/lodash.extended',
'lodash-src': '../vendor/lodash',
moment: '../vendor/moment',
chromath: '../vendor/chromath',
@@ -47,10 +47,6 @@ require.config({
},
shim: {
underscore: {
exports: '_'
},
bootstrap: {
deps: ['jquery']
},