Merge branch '38869-issue' into 'master'
Remove issue and issue status select from global namespace See merge request gitlab-org/gitlab-ce!15090
This commit is contained in:
commit
c598283a16
7 changed files with 40 additions and 53 deletions
|
@ -7,10 +7,12 @@ import { highCountTrim } from '~/lib/utils/text_utility';
|
|||
* @param {jQuery.Event} e
|
||||
* @param {String} count
|
||||
*/
|
||||
$(document).on('todo:toggle', (e, count) => {
|
||||
const parsedCount = parseInt(count, 10);
|
||||
const $todoPendingCount = $('.todos-count');
|
||||
export default function initTodoToggle() {
|
||||
$(document).on('todo:toggle', (e, count) => {
|
||||
const parsedCount = parseInt(count, 10);
|
||||
const $todoPendingCount = $('.todos-count');
|
||||
|
||||
$todoPendingCount.text(highCountTrim(parsedCount));
|
||||
$todoPendingCount.toggleClass('hidden', parsedCount === 0);
|
||||
});
|
||||
$todoPendingCount.text(highCountTrim(parsedCount));
|
||||
$todoPendingCount.toggleClass('hidden', parsedCount === 0);
|
||||
});
|
||||
}
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
/* eslint-disable no-new */
|
||||
/* global LabelsSelect */
|
||||
/* global MilestoneSelect */
|
||||
/* global IssueStatusSelect */
|
||||
/* global SubscriptionSelect */
|
||||
|
||||
import UsersSelect from './users_select';
|
||||
import issueStatusSelect from './issue_status_select';
|
||||
|
||||
export default () => {
|
||||
new UsersSelect();
|
||||
new LabelsSelect();
|
||||
new MilestoneSelect();
|
||||
new IssueStatusSelect();
|
||||
issueStatusSelect();
|
||||
new SubscriptionSelect();
|
||||
};
|
||||
|
|
|
@ -1,12 +1,11 @@
|
|||
/* eslint-disable class-methods-use-this, no-new */
|
||||
/* global LabelsSelect */
|
||||
/* global MilestoneSelect */
|
||||
/* global IssueStatusSelect */
|
||||
/* global SubscriptionSelect */
|
||||
|
||||
import IssuableBulkUpdateActions from './issuable_bulk_update_actions';
|
||||
import './milestone_select';
|
||||
import './issue_status_select';
|
||||
import issueStatusSelect from './issue_status_select';
|
||||
import './subscription_select';
|
||||
import './labels_select';
|
||||
|
||||
|
@ -49,7 +48,7 @@ export default class IssuableBulkUpdateSidebar {
|
|||
initDropdowns() {
|
||||
new LabelsSelect();
|
||||
new MilestoneSelect();
|
||||
new IssueStatusSelect();
|
||||
issueStatusSelect();
|
||||
new SubscriptionSelect();
|
||||
}
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ import TaskList from './task_list';
|
|||
import CreateMergeRequestDropdown from './create_merge_request_dropdown';
|
||||
import IssuablesHelper from './helpers/issuables_helper';
|
||||
|
||||
class Issue {
|
||||
export default class Issue {
|
||||
constructor() {
|
||||
if ($('a.btn-close').length) {
|
||||
this.taskList = new TaskList({
|
||||
|
@ -147,5 +147,3 @@ class Issue {
|
|||
});
|
||||
}
|
||||
}
|
||||
|
||||
export default Issue;
|
||||
|
|
|
@ -1,34 +1,23 @@
|
|||
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, quotes, object-shorthand, no-unused-vars, no-shadow, one-var, one-var-declaration-per-line, comma-dangle, max-len */
|
||||
(function() {
|
||||
this.IssueStatusSelect = (function() {
|
||||
function IssueStatusSelect() {
|
||||
$('.js-issue-status').each(function(i, el) {
|
||||
var fieldName;
|
||||
fieldName = $(el).data("field-name");
|
||||
return $(el).glDropdown({
|
||||
selectable: true,
|
||||
fieldName: fieldName,
|
||||
toggleLabel: (function(_this) {
|
||||
return function(selected, el, instance) {
|
||||
var $item, label;
|
||||
label = 'Author';
|
||||
$item = instance.dropdown.find('.is-active');
|
||||
if ($item.length) {
|
||||
label = $item.text();
|
||||
}
|
||||
return label;
|
||||
};
|
||||
})(this),
|
||||
clicked: function(options) {
|
||||
return options.e.preventDefault();
|
||||
},
|
||||
id: function(obj, el) {
|
||||
return $(el).data("id");
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
return IssueStatusSelect;
|
||||
})();
|
||||
}).call(window);
|
||||
export default function issueStatusSelect() {
|
||||
$('.js-issue-status').each((i, el) => {
|
||||
const fieldName = $(el).data('field-name');
|
||||
return $(el).glDropdown({
|
||||
selectable: true,
|
||||
fieldName,
|
||||
toggleLabel(selected, element, instance) {
|
||||
let label = 'Author';
|
||||
const $item = instance.dropdown.find('.is-active');
|
||||
if ($item.length) {
|
||||
label = $item.text();
|
||||
}
|
||||
return label;
|
||||
},
|
||||
clicked(options) {
|
||||
return options.e.preventDefault();
|
||||
},
|
||||
id(obj, element) {
|
||||
return $(element).data('id');
|
||||
},
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
|
@ -54,11 +54,8 @@ import './gl_dropdown';
|
|||
import './gl_field_error';
|
||||
import './gl_field_errors';
|
||||
import './gl_form';
|
||||
import './header';
|
||||
import initTodoToggle from './header';
|
||||
import initImporterStatus from './importer_status';
|
||||
import './issuable_form';
|
||||
import './issue';
|
||||
import './issue_status_select';
|
||||
import './labels_select';
|
||||
import './layout_nav';
|
||||
import LazyLoader from './lazy_loader';
|
||||
|
@ -137,6 +134,7 @@ $(function () {
|
|||
|
||||
initBreadcrumbs();
|
||||
initImporterStatus();
|
||||
initTodoToggle();
|
||||
|
||||
// Set the default path for all cookies to GitLab's root directory
|
||||
Cookies.defaults.path = gon.relative_url_root || '/';
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import '~/header';
|
||||
import initTodoToggle from '~/header';
|
||||
|
||||
describe('Header', function () {
|
||||
const todosPendingCount = '.todos-count';
|
||||
|
@ -14,6 +14,7 @@ describe('Header', function () {
|
|||
|
||||
preloadFixtures(fixtureTemplate);
|
||||
beforeEach(() => {
|
||||
initTodoToggle();
|
||||
loadFixtures(fixtureTemplate);
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in a new issue