Switch from underscore to lodash, #659

src/app/app.js

@@ -4,7 +4,7 @@
 define([
   'angular',
   'jquery',
-  'underscore',
+  'lodash',
   'require',
   'config',
   'bootstrap',

src/app/components/kbn.js

@@ -1,4 +1,4 @@
-define(['jquery','underscore','moment'],
+define(['jquery','lodash','moment'],
 function($, _, moment) {
   'use strict';
 

src/app/components/lodash.extended.js

@@ -1,5 +1,5 @@
 define([
-  'underscore-src'
+  'lodash-src'
 ],
 function () {
   'use strict';

src/app/components/require.config.js

@@ -23,8 +23,8 @@ require.config({
     crypto:                   '../vendor/crypto.min',
     spectrum:                 '../vendor/spectrum',
 
-    underscore:               'components/underscore.extended',
-    'underscore-src':         '../vendor/underscore',
+    lodash:                   'components/lodash.extended',
+    'lodash-src':             '../vendor/lodash',
     bootstrap:                '../vendor/bootstrap/bootstrap',
 
     jquery:                   '../vendor/jquery/jquery-1.8.0',
@@ -46,9 +46,6 @@ require.config({
 
   },
   shim: {
-    underscore: {
-      exports: '_'
-    },
 
     spectrum: {
       deps: ['jquery']

src/app/components/settings.js

@@ -1,5 +1,5 @@
 define([
-  'underscore',
+  'lodash',
   'crypto',
 ],
 function (_, crypto) {

src/app/controllers/dash.js

@@ -2,7 +2,7 @@ define([
   'angular',
   'jquery',
   'config',
-  'underscore',
+  'lodash',
   'services/all',
 ],
 function (angular, $, config, _) {

src/app/controllers/dashLoader.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'moment',
   'config',
   'filesaver'

src/app/controllers/grafanaCtrl.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'config',
-  'underscore',
+  'lodash',
 ],
 function (angular, config, _) {
   "use strict";

src/app/controllers/graphiteImport.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

src/app/controllers/graphiteTarget.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'config',
   '../services/graphite/gfunc',
   '../services/graphite/parser'

src/app/controllers/metricKeys.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'config'
 ],
 function (angular, _, config) {

src/app/controllers/opentsdbTargetCtrl.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'kbn'
 ],
 function (angular, _, kbn) {

src/app/controllers/playlistCtrl.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'config'
 ],
 function (angular, _, config) {

src/app/controllers/pulldown.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

src/app/controllers/row.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

src/app/controllers/search.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'config',
   'jquery'
 ],

src/app/controllers/submenuCtrl.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

src/app/directives/addGraphiteFunc.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'app',
-  'underscore',
+  'lodash',
   'jquery',
   '../services/graphite/gfunc',
 ],

src/app/directives/addPanel.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

src/app/directives/arrayJoin.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

src/app/directives/bodyClass.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

src/app/directives/configModal.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'jquery'
 ],
 function (angular, _, $) {

src/app/directives/grafanaGraph.js

@@ -3,7 +3,7 @@ define([
   'jquery',
   'kbn',
   'moment',
-  'underscore'
+  'lodash'
 ],
 function (angular, $, kbn, moment, _) {
   'use strict';

src/app/directives/grafanaPanel.js

@@ -1,7 +1,7 @@
 define([
   'angular',
   'jquery',
-  'underscore',
+  'lodash',
 ],
 function (angular, $) {
   'use strict';

src/app/directives/grafanaSimplePanel.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore'
+  'lodash'
 ],
 function (angular, _) {
   'use strict';

src/app/directives/graphiteFuncEditor.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'jquery',
 ],
 function (angular, _, $) {

src/app/directives/influxdbFuncEditor.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'jquery',
 ],
 function (angular, _, $) {

src/app/filters/all.js

@@ -1,4 +1,4 @@
-define(['angular', 'jquery', 'underscore', 'moment'], function (angular, $, _, moment) {
+define(['angular', 'jquery', 'lodash', 'moment'], function (angular, $, _, moment) {
   'use strict';
 
   var module = angular.module('grafana.filters');

src/app/panels/annotations/editor.js

@@ -4,7 +4,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

src/app/panels/annotations/module.js

@@ -6,7 +6,7 @@
 define([
   'angular',
   'app',
-  'underscore',
+  'lodash',
   './editor'
 ],
 function (angular, app, _) {

src/app/panels/filtering/module.js

@@ -6,7 +6,7 @@
 define([
   'angular',
   'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
   'use strict';

src/app/panels/graph/module.js

@@ -15,7 +15,7 @@ define([
   'angular',
   'app',
   'jquery',
-  'underscore',
+  'lodash',
   'kbn',
   'moment',
   './timeSeries',

src/app/panels/graph/timeSeries.js

@@ -1,5 +1,5 @@
 define([
-  'underscore',
+  'lodash',
   'kbn'
 ],
 function (_, kbn) {

src/app/panels/text/module.js

@@ -13,7 +13,7 @@
 define([
   'angular',
   'app',
-  'underscore',
+  'lodash',
   'require',
   'services/filterSrv'
 ],

src/app/panels/timepicker/module.js

@@ -15,7 +15,7 @@
 define([
   'angular',
   'app',
-  'underscore',
+  'lodash',
   'moment',
   'kbn'
 ],

src/app/routes/dashboard-from-file.js

@@ -2,7 +2,7 @@ define([
   'angular',
   'jquery',
   'config',
-  'underscore'
+  'lodash'
 ],
 function (angular, $, config, _) {
   "use strict";

src/app/routes/dashboard-from-script.js

@@ -2,7 +2,7 @@ define([
   'angular',
   'jquery',
   'config',
-  'underscore',
+  'lodash',
   'kbn',
   'moment'
 ],

src/app/services/alertSrv.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore'
+  'lodash'
 ],
 function (angular, _) {
   'use strict';

src/app/services/annotationsSrv.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'moment'
 ], function (angular, _, moment) {
   'use strict';

src/app/services/dashboard/dashboardModel.js

@@ -2,7 +2,7 @@ define([
   'angular',
   'jquery',
   'kbn',
-  'underscore',
+  'lodash',
   '../timer',
 ],
 function (angular, $, kbn, _) {

src/app/services/datasourceSrv.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'config',
   './graphite/graphiteDatasource',
   './influxdb/influxdbDatasource',

src/app/services/elasticsearch/es-datasource.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'jquery',
   'config',
   'kbn',

src/app/services/filterSrv.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'config',
   'kbn'
 ], function (angular, _, config, kbn) {

src/app/services/graphite/gfunc.js

@@ -1,5 +1,5 @@
 define([
-  'underscore'
+  'lodash'
 ],
 function (_) {
   'use strict';

src/app/services/graphite/graphiteDatasource.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'jquery',
   'config',
   'kbn',

src/app/services/graphite/lexer.js

@@ -1,5 +1,5 @@
 define([
-  'underscore'
+  'lodash'
 ], function(_) {
   'use strict';
 

src/app/services/influxdb/influxSeries.js

@@ -1,5 +1,5 @@
 define([
-  'underscore',
+  'lodash',
 ],
 function (_) {
   'use strict';

src/app/services/influxdb/influxdbDatasource.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'kbn',
   './influxSeries'
 ],

src/app/services/opentsdb/opentsdbDatasource.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'kbn'
 ],
 function (angular, _, kbn) {

src/app/services/panelMove.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore'
+  'lodash'
 ],
 function (angular, _) {
   'use strict';

src/app/services/panelSrv.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'jquery',
 ],
 function (angular, _, $) {

src/app/services/playlistSrv.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'kbn'
 ],
 function (angular, _, kbn) {

src/app/services/timer.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore'
+  'lodash'
 ],
 function (angular, _) {
   'use strict';

src/app/services/unsavedChangesSrv.js

@@ -1,6 +1,6 @@
 define([
   'angular',
-  'underscore',
+  'lodash',
   'config',
 ],
 function(angular, _, config) {

src/test/specs/filterSrv-specs.js

@@ -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();
     }));
 

src/test/test-main.js

@@ -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']
     },