summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-03-14 16:25:14 -0500
committerMike Greiling <mike@pixelcog.com>2018-03-14 16:25:14 -0500
commit221cd1d7d4b76168894efa6c2415744815a0b60a (patch)
tree0f4370aea7fde196eeb03372dad00b66a31c1b00
parent335a72f70ca601c96d1c2b8273eb2d8d49629b5a (diff)
downloadgitlab-ce-23110-why-not-upgrade-to-lodash.tar.gz
remove underscore from a few modules23110-why-not-upgrade-to-lodash
-rw-r--r--app/assets/javascripts/job.js6
-rw-r--r--app/assets/javascripts/protected_branches/protected_branch_create.js6
-rw-r--r--app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.js5
3 files changed, 8 insertions, 9 deletions
diff --git a/app/assets/javascripts/job.js b/app/assets/javascripts/job.js
index ace45e9dd29..b3c93bca97b 100644
--- a/app/assets/javascripts/job.js
+++ b/app/assets/javascripts/job.js
@@ -1,5 +1,5 @@
import $ from 'jquery';
-import _ from 'underscore';
+import { throttle } from 'lodash-es';
import axios from './lib/utils/axios_utils';
import { visitUrl } from './lib/utils/url_utility';
import bp from './breakpoints';
@@ -56,7 +56,7 @@ export default class Job {
.off('click')
.on('click', this.scrollToBottom.bind(this));
- this.scrollThrottled = _.throttle(this.toggleScroll.bind(this), 100);
+ this.scrollThrottled = throttle(this.toggleScroll.bind(this), 100);
this.$window
.off('scroll')
@@ -71,7 +71,7 @@ export default class Job {
this.$window
.off('resize.build')
- .on('resize.build', _.throttle(this.sidebarOnResize.bind(this), 100));
+ .on('resize.build', throttle(this.sidebarOnResize.bind(this), 100));
this.initAffixTopArea();
diff --git a/app/assets/javascripts/protected_branches/protected_branch_create.js b/app/assets/javascripts/protected_branches/protected_branch_create.js
index 7c61c070a35..50142f8f57c 100644
--- a/app/assets/javascripts/protected_branches/protected_branch_create.js
+++ b/app/assets/javascripts/protected_branches/protected_branch_create.js
@@ -1,5 +1,5 @@
import $ from 'jquery';
-import _ from 'underscore';
+import { findLastIndex } from 'lodash-es';
import ProtectedBranchAccessDropdown from './protected_branch_access_dropdown';
import CreateItemDropdown from '../create_item_dropdown';
import AccessorUtilities from '../lib/utils/accessor';
@@ -73,10 +73,10 @@ export default class ProtectedBranchCreate {
if (this.isLocalStorageAvailable) {
const savedDefaults = JSON.parse(window.localStorage.getItem(PB_LOCAL_STORAGE_KEY));
if (savedDefaults != null) {
- mergeIndex = _.findLastIndex(mergeDropdown.fullData.roles, {
+ mergeIndex = findLastIndex(mergeDropdown.fullData.roles, {
id: parseInt(savedDefaults.mergeSelection, 0),
});
- pushIndex = _.findLastIndex(pushDropdown.fullData.roles, {
+ pushIndex = findLastIndex(pushDropdown.fullData.roles, {
id: parseInt(savedDefaults.pushSelection, 0),
});
}
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.js b/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.js
index 5626cccc022..192517e1c9a 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.js
+++ b/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.js
@@ -1,6 +1,5 @@
import $ from 'jquery';
-import _ from 'underscore';
-
+import { intersection } from 'lodash-es';
import '~/smart_interval';
import IssuableTimeTracker from './time_tracker.vue';
@@ -36,7 +35,7 @@ export default {
} else {
changedCommands = [];
}
- if (changedCommands && _.intersection(subscribedCommands, changedCommands).length) {
+ if (changedCommands && intersection(subscribedCommands, changedCommands).length) {
this.mediator.fetch();
}
},