Merge pull request #1268 from marmelab/Use-Lodash-instead-of-underscore

Use lodash instead of underscore
marmelab · Dec 9, 2016 · db3d9dd · db3d9dd
2 parents 49fdc56 + 951f276
commit db3d9dd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -38,8 +38,7 @@
     "rangy": "^1.3.0",
     "restangular": "~1.5.2",
     "textangular": "1.4.3",
-    "ui-select": "0.18.1",
-    "underscore": "^1.8.3"
+    "ui-select": "0.18.1"
   },
   "devDependencies": {
     "angular-mocks": "~1.4.8",
@@ -68,6 +67,8 @@
     "karma-ng-scenario": "~0.1.0",
     "karma-phantomjs-launcher": "~1.0.0",
     "karma-webpack": "~1.7.0",
+    "lodash": "^4.17.2",
+    "lodash.debounce": "4.0.8",
     "mocha": "^2.1.0",
     "ng-annotate-loader": "0.0.2",
     "ngtemplate-loader": "^1.3.0",

diff --git a/src/javascripts/ng-admin/Crud/list/ListLayoutController.js b/src/javascripts/ng-admin/Crud/list/ListLayoutController.js
@@ -1,4 +1,4 @@
-/* globals _ */
+const debounce = require('lodash.debounce');
 
 export default class ListLayoutController {
     constructor($scope, $stateParams, $state, $location, $timeout, view, dataStore) {
@@ -34,7 +34,7 @@ export default class ListLayoutController {
         // apply filters when filter values change
         $scope.$watch(
             () => this.search,
-            _.debounce((newValues, oldValues) => {
+            debounce((newValues, oldValues) => {
                 if (newValues != oldValues) {
                     this.updateFilters();
                 }

diff --git a/src/javascripts/vendors.js b/src/javascripts/vendors.js
@@ -12,4 +12,4 @@ require('angular-numeraljs');
 require('angular-ui-bootstrap/dist/ui-bootstrap-tpls');
 require('ng-file-upload');
 
-global._ = require('underscore');
+global._ = require('lodash');