Switch from underscore to lodash, #659

23c9f973 · Torkel Ödegaard · c3a6ae16 · 23c9f973 · 23c9f973 · 23c9f973
Commit 23c9f973 authored Aug 07, 2014 by Torkel Ödegaard
58 changed files
--- a/src/app/app.js
+++ b/src/app/app.js
@@ -4,7 +4,7 @@
 define([
  'angular',
  'jquery',
-  'underscore',
+  'lodash',
  'require',
  'config',
  'bootstrap',

--- a/src/app/components/kbn.js
+++ b/src/app/components/kbn.js
-define(['jquery','underscore','moment'],
+define(['jquery','lodash','moment'],
 function($, _, moment) {
  'use strict';


--- a/src/app/components/underscore.extended.js
+++ b/src/app/components/underscore.extended.js
 define([
-  'underscore-src'
+  'lodash-src'
 ],
 function () {
  'use strict';

--- a/src/app/components/require.config.js
+++ b/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']

--- a/src/app/components/settings.js
+++ b/src/app/components/settings.js
 define([
-  'underscore',
+  'lodash',
  'crypto',
 ],
 function (_, crypto) {

--- a/src/app/controllers/dash.js
+++ b/src/app/controllers/dash.js
@@ -2,7 +2,7 @@ define([
  'angular',
  'jquery',
  'config',
-  'underscore',
+  'lodash',
  'services/all',
 ],
 function (angular, $, config, _) {

--- a/src/app/controllers/dashLoader.js
+++ b/src/app/controllers/dashLoader.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'moment',
  'config',
  'filesaver'

--- a/src/app/controllers/grafanaCtrl.js
+++ b/src/app/controllers/grafanaCtrl.js
 define([
  'angular',
  'config',
-  'underscore',
+  'lodash',
 ],
 function (angular, config, _) {
  "use strict";

--- a/src/app/controllers/graphiteImport.js
+++ b/src/app/controllers/graphiteImport.js
 define([
  'angular',
  'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
  'use strict';

--- a/src/app/controllers/graphiteTarget.js
+++ b/src/app/controllers/graphiteTarget.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'config',
  '../services/graphite/gfunc',
  '../services/graphite/parser'

--- a/src/app/controllers/metricKeys.js
+++ b/src/app/controllers/metricKeys.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'config'
 ],
 function (angular, _, config) {

--- a/src/app/controllers/opentsdbTargetCtrl.js
+++ b/src/app/controllers/opentsdbTargetCtrl.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'kbn'
 ],
 function (angular, _, kbn) {

--- a/src/app/controllers/playlistCtrl.js
+++ b/src/app/controllers/playlistCtrl.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'config'
 ],
 function (angular, _, config) {

--- a/src/app/controllers/pulldown.js
+++ b/src/app/controllers/pulldown.js
 define([
  'angular',
  'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
  'use strict';

--- a/src/app/controllers/row.js
+++ b/src/app/controllers/row.js
 define([
  'angular',
  'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
  'use strict';

--- a/src/app/controllers/search.js
+++ b/src/app/controllers/search.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'config',
  'jquery'
 ],

--- a/src/app/controllers/submenuCtrl.js
+++ b/src/app/controllers/submenuCtrl.js
 define([
  'angular',
  'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
  'use strict';

--- a/src/app/directives/addGraphiteFunc.js
+++ b/src/app/directives/addGraphiteFunc.js
 define([
  'angular',
  'app',
-  'underscore',
+  'lodash',
  'jquery',
  '../services/graphite/gfunc',
 ],

--- a/src/app/directives/addPanel.js
+++ b/src/app/directives/addPanel.js
 define([
  'angular',
  'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
  'use strict';

--- a/src/app/directives/arrayJoin.js
+++ b/src/app/directives/arrayJoin.js
 define([
  'angular',
  'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
  'use strict';

--- a/src/app/directives/bodyClass.js
+++ b/src/app/directives/bodyClass.js
 define([
  'angular',
  'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
  'use strict';

--- a/src/app/directives/configModal.js
+++ b/src/app/directives/configModal.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'jquery'
 ],
 function (angular, _, $) {

--- a/src/app/directives/grafanaGraph.js
+++ b/src/app/directives/grafanaGraph.js
@@ -3,7 +3,7 @@ define([
  'jquery',
  'kbn',
  'moment',
-  'underscore'
+  'lodash'
 ],
 function (angular, $, kbn, moment, _) {
  'use strict';

--- a/src/app/directives/grafanaPanel.js
+++ b/src/app/directives/grafanaPanel.js
 define([
  'angular',
  'jquery',
-  'underscore',
+  'lodash',
 ],
 function (angular, $) {
  'use strict';

--- a/src/app/directives/grafanaSimplePanel.js
+++ b/src/app/directives/grafanaSimplePanel.js
 define([
  'angular',
-  'underscore'
+  'lodash'
 ],
 function (angular, _) {
  'use strict';

--- a/src/app/directives/graphiteFuncEditor.js
+++ b/src/app/directives/graphiteFuncEditor.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'jquery',
 ],
 function (angular, _, $) {

--- a/src/app/directives/influxdbFuncEditor.js
+++ b/src/app/directives/influxdbFuncEditor.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'jquery',
 ],
 function (angular, _, $) {

--- a/src/app/filters/all.js
+++ b/src/app/filters/all.js
-define(['angular', 'jquery', 'underscore', 'moment'], function (angular, $, _, moment) {
+define(['angular', 'jquery', 'lodash', 'moment'], function (angular, $, _, moment) {
  'use strict';

  var module = angular.module('grafana.filters');

--- a/src/app/panels/annotations/editor.js
+++ b/src/app/panels/annotations/editor.js
@@ -4,7 +4,7 @@
 define([
  'angular',
  'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
  'use strict';

--- a/src/app/panels/annotations/module.js
+++ b/src/app/panels/annotations/module.js
@@ -6,7 +6,7 @@
 define([
  'angular',
  'app',
-  'underscore',
+  'lodash',
  './editor'
 ],
 function (angular, app, _) {

--- a/src/app/panels/filtering/module.js
+++ b/src/app/panels/filtering/module.js
@@ -6,7 +6,7 @@
 define([
  'angular',
  'app',
-  'underscore'
+  'lodash'
 ],
 function (angular, app, _) {
  'use strict';

--- a/src/app/panels/graph/module.js
+++ b/src/app/panels/graph/module.js
@@ -15,7 +15,7 @@ define([
  'angular',
  'app',
  'jquery',
-  'underscore',
+  'lodash',
  'kbn',
  'moment',
  './timeSeries',

--- a/src/app/panels/graph/timeSeries.js
+++ b/src/app/panels/graph/timeSeries.js
 define([
-  'underscore',
+  'lodash',
  'kbn'
 ],
 function (_, kbn) {

--- a/src/app/panels/text/module.js
+++ b/src/app/panels/text/module.js
@@ -13,7 +13,7 @@
 define([
  'angular',
  'app',
-  'underscore',
+  'lodash',
  'require',
  'services/filterSrv'
 ],

--- a/src/app/panels/timepicker/module.js
+++ b/src/app/panels/timepicker/module.js
@@ -15,7 +15,7 @@
 define([
  'angular',
  'app',
-  'underscore',
+  'lodash',
  'moment',
  'kbn'
 ],

--- a/src/app/routes/dashboard-from-file.js
+++ b/src/app/routes/dashboard-from-file.js
@@ -2,7 +2,7 @@ define([
  'angular',
  'jquery',
  'config',
-  'underscore'
+  'lodash'
 ],
 function (angular, $, config, _) {
  "use strict";

--- a/src/app/routes/dashboard-from-script.js
+++ b/src/app/routes/dashboard-from-script.js
@@ -2,7 +2,7 @@ define([
  'angular',
  'jquery',
  'config',
-  'underscore',
+  'lodash',
  'kbn',
  'moment'
 ],

--- a/src/app/services/alertSrv.js
+++ b/src/app/services/alertSrv.js
 define([
  'angular',
-  'underscore'
+  'lodash'
 ],
 function (angular, _) {
  'use strict';

--- a/src/app/services/annotationsSrv.js
+++ b/src/app/services/annotationsSrv.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'moment'
 ], function (angular, _, moment) {
  'use strict';

--- a/src/app/services/dashboard/dashboardModel.js
+++ b/src/app/services/dashboard/dashboardModel.js
@@ -2,7 +2,7 @@ define([
  'angular',
  'jquery',
  'kbn',
-  'underscore',
+  'lodash',
  '../timer',
 ],
 function (angular, $, kbn, _) {

--- a/src/app/services/datasourceSrv.js
+++ b/src/app/services/datasourceSrv.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'config',
  './graphite/graphiteDatasource',
  './influxdb/influxdbDatasource',

--- a/src/app/services/elasticsearch/es-datasource.js
+++ b/src/app/services/elasticsearch/es-datasource.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'jquery',
  'config',
  'kbn',

--- a/src/app/services/filterSrv.js
+++ b/src/app/services/filterSrv.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'config',
  'kbn'
 ], function (angular, _, config, kbn) {

--- a/src/app/services/graphite/gfunc.js
+++ b/src/app/services/graphite/gfunc.js
 define([
-  'underscore'
+  'lodash'
 ],
 function (_) {
  'use strict';

--- a/src/app/services/graphite/graphiteDatasource.js
+++ b/src/app/services/graphite/graphiteDatasource.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'jquery',
  'config',
  'kbn',

--- a/src/app/services/graphite/lexer.js
+++ b/src/app/services/graphite/lexer.js
 define([
-  'underscore'
+  'lodash'
 ], function(_) {
  'use strict';


--- a/src/app/services/influxdb/influxSeries.js
+++ b/src/app/services/influxdb/influxSeries.js
 define([
-  'underscore',
+  'lodash',
 ],
 function (_) {
  'use strict';

--- a/src/app/services/influxdb/influxdbDatasource.js
+++ b/src/app/services/influxdb/influxdbDatasource.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'kbn',
  './influxSeries'
 ],

--- a/src/app/services/opentsdb/opentsdbDatasource.js
+++ b/src/app/services/opentsdb/opentsdbDatasource.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'kbn'
 ],
 function (angular, _, kbn) {

--- a/src/app/services/panelMove.js
+++ b/src/app/services/panelMove.js
 define([
  'angular',
-  'underscore'
+  'lodash'
 ],
 function (angular, _) {
  'use strict';

--- a/src/app/services/panelSrv.js
+++ b/src/app/services/panelSrv.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'jquery',
 ],
 function (angular, _, $) {

--- a/src/app/services/playlistSrv.js
+++ b/src/app/services/playlistSrv.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'kbn'
 ],
 function (angular, _, kbn) {

--- a/src/app/services/timer.js
+++ b/src/app/services/timer.js
 define([
  'angular',
-  'underscore'
+  'lodash'
 ],
 function (angular, _) {
  'use strict';

--- a/src/app/services/unsavedChangesSrv.js
+++ b/src/app/services/unsavedChangesSrv.js
 define([
  'angular',
-  'underscore',
+  'lodash',
  'config',
 ],
 function(angular, _, config) {

--- a/src/test/specs/filterSrv-specs.js
+++ b/src/test/specs/filterSrv-specs.js
 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();
    }));


--- a/src/test/test-main.js
+++ b/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']
    },

--- a/src/vendor/lodash.js
+++ b/src/vendor/lodash.js
--- a/src/vendor/underscore.js
+++ b/src/vendor/underscore.js