Commit 430131f7 authored by Filipa Lacerda's avatar Filipa Lacerda

Remove issue and issue status select from global namespace

parent bba020a5
...@@ -7,10 +7,12 @@ import { highCountTrim } from '~/lib/utils/text_utility'; ...@@ -7,10 +7,12 @@ import { highCountTrim } from '~/lib/utils/text_utility';
* @param {jQuery.Event} e * @param {jQuery.Event} e
* @param {String} count * @param {String} count
*/ */
$(document).on('todo:toggle', (e, count) => { export default function initTodoToggle() {
const parsedCount = parseInt(count, 10); $(document).on('todo:toggle', (e, count) => {
const $todoPendingCount = $('.todos-count'); const parsedCount = parseInt(count, 10);
const $todoPendingCount = $('.todos-count');
$todoPendingCount.text(highCountTrim(parsedCount)); $todoPendingCount.text(highCountTrim(parsedCount));
$todoPendingCount.toggleClass('hidden', parsedCount === 0); $todoPendingCount.toggleClass('hidden', parsedCount === 0);
}); });
}
/* eslint-disable no-new */ /* eslint-disable no-new */
/* global LabelsSelect */ /* global LabelsSelect */
/* global MilestoneSelect */ /* global MilestoneSelect */
/* global IssueStatusSelect */
/* global SubscriptionSelect */ /* global SubscriptionSelect */
import UsersSelect from './users_select'; import UsersSelect from './users_select';
import issueStatusSelect from './issue_status_select';
export default () => { export default () => {
new UsersSelect(); new UsersSelect();
new LabelsSelect(); new LabelsSelect();
new MilestoneSelect(); new MilestoneSelect();
new IssueStatusSelect(); issueStatusSelect();
new SubscriptionSelect(); new SubscriptionSelect();
}; };
/* eslint-disable class-methods-use-this, no-new */ /* eslint-disable class-methods-use-this, no-new */
/* global LabelsSelect */ /* global LabelsSelect */
/* global MilestoneSelect */ /* global MilestoneSelect */
/* global IssueStatusSelect */
/* global SubscriptionSelect */ /* global SubscriptionSelect */
import IssuableBulkUpdateActions from './issuable_bulk_update_actions'; import IssuableBulkUpdateActions from './issuable_bulk_update_actions';
import './milestone_select'; import './milestone_select';
import './issue_status_select'; import issueStatusSelect from './issue_status_select';
import './subscription_select'; import './subscription_select';
import './labels_select'; import './labels_select';
...@@ -49,7 +48,7 @@ export default class IssuableBulkUpdateSidebar { ...@@ -49,7 +48,7 @@ export default class IssuableBulkUpdateSidebar {
initDropdowns() { initDropdowns() {
new LabelsSelect(); new LabelsSelect();
new MilestoneSelect(); new MilestoneSelect();
new IssueStatusSelect(); issueStatusSelect();
new SubscriptionSelect(); new SubscriptionSelect();
} }
......
...@@ -6,7 +6,7 @@ import TaskList from './task_list'; ...@@ -6,7 +6,7 @@ import TaskList from './task_list';
import CreateMergeRequestDropdown from './create_merge_request_dropdown'; import CreateMergeRequestDropdown from './create_merge_request_dropdown';
import IssuablesHelper from './helpers/issuables_helper'; import IssuablesHelper from './helpers/issuables_helper';
class Issue { export default class Issue {
constructor() { constructor() {
if ($('a.btn-close').length) { if ($('a.btn-close').length) {
this.taskList = new TaskList({ this.taskList = new TaskList({
...@@ -147,5 +147,3 @@ class Issue { ...@@ -147,5 +147,3 @@ class Issue {
}); });
} }
} }
export default Issue;
/* 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 */ /* eslint-disable func-names,wrap-iife, no-shadow, no-unused-vars, one-var */
(function() { export default function issueStatusSelect() {
this.IssueStatusSelect = (function() { $('.js-issue-status').each(function (i, el) {
function IssueStatusSelect() { const fieldName = $(el).data('field-name');
$('.js-issue-status').each(function(i, el) { return $(el).glDropdown({
var fieldName; selectable: true,
fieldName = $(el).data("field-name"); fieldName,
return $(el).glDropdown({ toggleLabel: (function (_this) {
selectable: true, return function (selected, el, instance) {
fieldName: fieldName, let label = 'Author';
toggleLabel: (function(_this) { const $item = instance.dropdown.find('.is-active');
return function(selected, el, instance) { if ($item.length) {
var $item, label; label = $item.text();
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 label;
}); };
} })(this),
clicked(options) {
return IssueStatusSelect; return options.e.preventDefault();
})(); },
}).call(window); id(obj, el) {
return $(el).data('id');
},
});
});
}
...@@ -54,11 +54,8 @@ import './gl_dropdown'; ...@@ -54,11 +54,8 @@ import './gl_dropdown';
import './gl_field_error'; import './gl_field_error';
import './gl_field_errors'; import './gl_field_errors';
import './gl_form'; import './gl_form';
import './header'; import initTodoToggle from './header';
import initImporterStatus from './importer_status'; import initImporterStatus from './importer_status';
import './issuable_form';
import './issue';
import './issue_status_select';
import './labels_select'; import './labels_select';
import './layout_nav'; import './layout_nav';
import LazyLoader from './lazy_loader'; import LazyLoader from './lazy_loader';
...@@ -137,6 +134,7 @@ $(function () { ...@@ -137,6 +134,7 @@ $(function () {
initBreadcrumbs(); initBreadcrumbs();
initImporterStatus(); initImporterStatus();
initTodoToggle();
// Set the default path for all cookies to GitLab's root directory // Set the default path for all cookies to GitLab's root directory
Cookies.defaults.path = gon.relative_url_root || '/'; Cookies.defaults.path = gon.relative_url_root || '/';
......
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