Commit b3c7d47f authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch...

Merge branch '210273-replace-underscore-with-lodash-for-ee-app-assets-javascripts-roadmap-related_items' into 'master'

Replace underscore with lodash for ./ee/../roadmap & ./related_items"

Closes #210273

See merge request gitlab-org/gitlab!28061
parents 10688cfd d2ccb045
<script> <script>
import _ from 'underscore'; import { isNumber } from 'lodash';
export default { export default {
// name: 'Cell' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/25 // name: 'Cell' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/25
...@@ -24,7 +24,7 @@ export default { ...@@ -24,7 +24,7 @@ export default {
}, },
computed: { computed: {
valueClass() { valueClass() {
return { number: _.isNumber(this.value) }; return { number: isNumber(this.value) };
}, },
flexClass() { flexClass() {
return { 'flex-grow-1': this.isFlexible }; return { 'flex-grow-1': this.isFlexible };
......
<script> <script>
import _ from 'underscore';
import { mapState, mapActions, mapGetters } from 'vuex'; import { mapState, mapActions, mapGetters } from 'vuex';
import { redirectTo } from '~/lib/utils/url_utility'; import { redirectTo } from '~/lib/utils/url_utility';
import Tracking from '~/tracking'; import Tracking from '~/tracking';
...@@ -111,7 +110,7 @@ export default { ...@@ -111,7 +110,7 @@ export default {
const { selector, text, placement } = this.actionPopover; const { selector, text, placement } = this.actionPopover;
// immediately show the action popover if there's not helpContent for this step // immediately show the action popover if there's not helpContent for this step
const showPopover = !this.helpContent && !_.isUndefined(selector); const showPopover = !this.helpContent && selector !== undefined;
actionPopoverUtils.renderPopover(selector, text, placement, showPopover); actionPopoverUtils.renderPopover(selector, text, placement, showPopover);
} }
...@@ -161,7 +160,7 @@ export default { ...@@ -161,7 +160,7 @@ export default {
} }
// dismiss popover if necessary // dismiss popover if necessary
if (_.isUndefined(dismissPopover) || dismissPopover === true) { if (dismissPopover === undefined || dismissPopover === true) {
this.dismissPopover = true; this.dismissPopover = true;
} }
...@@ -172,7 +171,7 @@ export default { ...@@ -172,7 +171,7 @@ export default {
} }
// switch to the next tour part // switch to the next tour part
if (!_.isUndefined(nextPart)) { if (nextPart !== undefined) {
this.switchTourPart(nextPart); this.switchTourPart(nextPart);
this.initActionPopover(); this.initActionPopover();
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment