Merge branch 'remove-old-isobject' into 'master'
Replace old isObject for underscore methods Closes #30317 See merge request !11124
This commit is contained in:
commit
566ee14516
|
@ -1,5 +1,6 @@
|
|||
<script>
|
||||
import Timeago from 'timeago.js';
|
||||
import _ from 'underscore';
|
||||
import '../../lib/utils/text_utility';
|
||||
import ActionsComponent from './environment_actions.vue';
|
||||
import ExternalUrlComponent from './environment_external_url.vue';
|
||||
|
@ -59,7 +60,7 @@ export default {
|
|||
hasLastDeploymentKey() {
|
||||
if (this.model &&
|
||||
this.model.last_deployment &&
|
||||
!this.$options.isObjectEmpty(this.model.last_deployment)) {
|
||||
!_.isEmpty(this.model.last_deployment)) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
@ -310,8 +311,8 @@ export default {
|
|||
*/
|
||||
deploymentHasUser() {
|
||||
return this.model &&
|
||||
!this.$options.isObjectEmpty(this.model.last_deployment) &&
|
||||
!this.$options.isObjectEmpty(this.model.last_deployment.user);
|
||||
!_.isEmpty(this.model.last_deployment) &&
|
||||
!_.isEmpty(this.model.last_deployment.user);
|
||||
},
|
||||
|
||||
/**
|
||||
|
@ -322,8 +323,8 @@ export default {
|
|||
*/
|
||||
deploymentUser() {
|
||||
if (this.model &&
|
||||
!this.$options.isObjectEmpty(this.model.last_deployment) &&
|
||||
!this.$options.isObjectEmpty(this.model.last_deployment.user)) {
|
||||
!_.isEmpty(this.model.last_deployment) &&
|
||||
!_.isEmpty(this.model.last_deployment.user)) {
|
||||
return this.model.last_deployment.user;
|
||||
}
|
||||
return {};
|
||||
|
@ -338,8 +339,8 @@ export default {
|
|||
*/
|
||||
shouldRenderBuildName() {
|
||||
return !this.model.isFolder &&
|
||||
!this.$options.isObjectEmpty(this.model.last_deployment) &&
|
||||
!this.$options.isObjectEmpty(this.model.last_deployment.deployable);
|
||||
!_.isEmpty(this.model.last_deployment) &&
|
||||
!_.isEmpty(this.model.last_deployment.deployable);
|
||||
},
|
||||
|
||||
/**
|
||||
|
@ -380,7 +381,7 @@ export default {
|
|||
*/
|
||||
shouldRenderDeploymentID() {
|
||||
return !this.model.isFolder &&
|
||||
!this.$options.isObjectEmpty(this.model.last_deployment) &&
|
||||
!_.isEmpty(this.model.last_deployment) &&
|
||||
this.model.last_deployment.iid !== undefined;
|
||||
},
|
||||
|
||||
|
@ -410,21 +411,6 @@ export default {
|
|||
},
|
||||
},
|
||||
|
||||
/**
|
||||
* Helper to verify if certain given object are empty.
|
||||
* Should be replaced by lodash _.isEmpty - https://lodash.com/docs/4.17.2#isEmpty
|
||||
* @param {Object} object
|
||||
* @returns {Bollean}
|
||||
*/
|
||||
isObjectEmpty(object) {
|
||||
for (const key in object) { // eslint-disable-line
|
||||
if (hasOwnProperty.call(object, key)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
},
|
||||
|
||||
methods: {
|
||||
onClickFolder() {
|
||||
eventHub.$emit('toggleFolder', this.model, this.folderUrl);
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/* eslint-disable func-names, space-before-function-paren, no-var, one-var, one-var-declaration-per-line, prefer-rest-params, max-len, vars-on-top, wrap-iife, no-unused-vars, quotes, no-shadow, no-cond-assign, prefer-arrow-callback, no-return-assign, no-else-return, camelcase, comma-dangle, no-lonely-if, guard-for-in, no-restricted-syntax, consistent-return, prefer-template, no-param-reassign, no-loop-func, no-mixed-operators */
|
||||
/* global fuzzaldrinPlus */
|
||||
import { isObject } from './lib/utils/type_utility';
|
||||
|
||||
var GitLabDropdown, GitLabDropdownFilter, GitLabDropdownRemote;
|
||||
|
||||
|
@ -93,7 +94,7 @@ GitLabDropdownFilter = (function() {
|
|||
// { prop: 'def' }
|
||||
// ]
|
||||
// }
|
||||
if (gl.utils.isObject(data)) {
|
||||
if (isObject(data)) {
|
||||
results = {};
|
||||
for (key in data) {
|
||||
group = data[key];
|
||||
|
@ -396,7 +397,7 @@ GitLabDropdown = (function() {
|
|||
html = [this.noResults()];
|
||||
} else {
|
||||
// Handle array groups
|
||||
if (gl.utils.isObject(data)) {
|
||||
if (isObject(data)) {
|
||||
html = [];
|
||||
for (name in data) {
|
||||
groupData = data[name];
|
||||
|
|
|
@ -1,15 +1,2 @@
|
|||
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-param-reassign, no-cond-assign, no-return-assign, max-len */
|
||||
(function() {
|
||||
(function(w) {
|
||||
var base;
|
||||
if (w.gl == null) {
|
||||
w.gl = {};
|
||||
}
|
||||
if ((base = w.gl).utils == null) {
|
||||
base.utils = {};
|
||||
}
|
||||
return w.gl.utils.isObject = function(obj) {
|
||||
return (obj != null) && (obj.constructor === Object);
|
||||
};
|
||||
})(window);
|
||||
}).call(window);
|
||||
// eslint-disable-next-line import/prefer-default-export
|
||||
export const isObject = obj => obj && obj.constructor === Object;
|
||||
|
|
|
@ -59,7 +59,6 @@ import './lib/utils/datetime_utility';
|
|||
import './lib/utils/notify';
|
||||
import './lib/utils/pretty_time';
|
||||
import './lib/utils/text_utility';
|
||||
import './lib/utils/type_utility';
|
||||
import './lib/utils/url_utility';
|
||||
|
||||
// u2f
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Remove unused code and uses underscore
|
||||
merge_request:
|
||||
author:
|
|
@ -1,5 +1,4 @@
|
|||
require('~/gl_dropdown');
|
||||
require('~/lib/utils/type_utility');
|
||||
require('~/blob/create_branch_dropdown');
|
||||
require('~/blob/target_branch_dropdown');
|
||||
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
require('~/gl_dropdown');
|
||||
require('~/lib/utils/type_utility');
|
||||
require('~/blob/create_branch_dropdown');
|
||||
require('~/blob/target_branch_dropdown');
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
require('~/gl_dropdown');
|
||||
require('~/lib/utils/common_utils');
|
||||
require('~/lib/utils/type_utility');
|
||||
require('~/lib/utils/url_utility');
|
||||
|
||||
(() => {
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
/* global IssuableContext */
|
||||
/* global LabelsSelect */
|
||||
|
||||
require('~/lib/utils/type_utility');
|
||||
require('~/gl_dropdown');
|
||||
require('select2');
|
||||
require('vendor/jquery.nicescroll');
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
/* global Project */
|
||||
|
||||
require('select2/select2.js');
|
||||
require('~/lib/utils/type_utility');
|
||||
require('~/gl_dropdown');
|
||||
require('~/api');
|
||||
require('~/project_select');
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
require('~/gl_dropdown');
|
||||
require('~/search_autocomplete');
|
||||
require('~/lib/utils/common_utils');
|
||||
require('~/lib/utils/type_utility');
|
||||
require('vendor/fuzzaldrin-plus');
|
||||
|
||||
(function() {
|
||||
|
|
Loading…
Reference in New Issue