kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fix-master-eslint-errors' into 'master'

Browse source 
Fix eslint errors

Fixes current eslint errors on master

See merge request !8127
This commit is contained in:
Douglas Barbosa Alexandre 2016-12-16 01:48:16 +00:00
commit 49a70d1e45
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/dispatcher.js.es6
View file

@ -75,7 +75,7 @@
case 'projects:issues:index': case 'projects:issues:index':
Issuable.init(); Issuable.init();
new gl.IssuableBulkActions({ new gl.IssuableBulkActions({
prefixId: page === 'projects:merge_requests:index' ? 'merge_request_' : 'issue_' prefixId: page === 'projects:merge_requests:index' ? 'merge_request_' : 'issue_',
}); });
shortcut_handler = new ShortcutsNavigation(); shortcut_handler = new ShortcutsNavigation();
break; break;

14
app/assets/javascripts/issues_bulk_assignment.js.es6
View file

@ -6,7 +6,7 @@
class IssuableBulkActions { class IssuableBulkActions {
constructor({ container, form, issues, prefixId } = {}) { constructor({ container, form, issues, prefixId } = {}) {
this.prefixId = prefixId || 'issue_'; this.prefixId = prefixId || 'issue_';
this.form = form || this.getElement('.bulk-update'); this.form = form || this.getElement('.bulk-update');
this.$labelDropdown = this.form.find('.js-label-select'); this.$labelDropdown = this.form.find('.js-label-select');
this.issues = issues || this.getElement('.issues-list .issue'); this.issues = issues || this.getElement('.issues-list .issue');
@ -107,7 +107,7 @@
} }
setOriginalDropdownData() { setOriginalDropdownData() {
let $labelSelect = $('.bulk-update .js-label-select'); const $labelSelect = $('.bulk-update .js-label-select');
$labelSelect.data('common', this.getOriginalCommonIds()); $labelSelect.data('common', this.getOriginalCommonIds());
$labelSelect.data('marked', this.getOriginalMarkedIds()); $labelSelect.data('marked', this.getOriginalMarkedIds());
$labelSelect.data('indeterminate', this.getOriginalIndeterminateIds()); $labelSelect.data('indeterminate', this.getOriginalIndeterminateIds());
@ -115,7 +115,7 @@
// From issuable's initial bulk selection // From issuable's initial bulk selection
getOriginalCommonIds() { getOriginalCommonIds() {
let labelIds = []; const labelIds = [];
this.getElement('.selected_issue:checked').each((i, el) => { this.getElement('.selected_issue:checked').each((i, el) => {
labelIds.push(this.getElement(`#${this.prefixId}${el.dataset.id}`).data('labels')); labelIds.push(this.getElement(`#${this.prefixId}${el.dataset.id}`).data('labels'));
@ -125,17 +125,17 @@
// From issuable's initial bulk selection // From issuable's initial bulk selection
getOriginalMarkedIds() { getOriginalMarkedIds() {
var labelIds = []; const labelIds = [];
this.getElement('.selected_issue:checked').each((i, el) => { this.getElement('.selected_issue:checked').each((i, el) => {
labelIds.push(this.getElement(`#${this.prefixId}${el.dataset.id}`).data('labels')); labelIds.push(this.getElement(`#${this.prefixId}${el.dataset.id}`).data('labels'));
}); });
return _.intersection.apply(_, labelIds); return _.intersection.apply(this, labelIds);
} }
// From issuable's initial bulk selection // From issuable's initial bulk selection
getOriginalIndeterminateIds() { getOriginalIndeterminateIds() {
let uniqueIds = []; const uniqueIds = [];
let labelIds = []; const labelIds = [];
let issuableLabels = []; let issuableLabels = [];
// Collect unique label IDs for all checked issues // Collect unique label IDs for all checked issues

2
app/assets/javascripts/labels_select.js
View file

@ -8,7 +8,7 @@
var _this; var _this;
_this = this; _this = this;
$('.js-label-select').each(function(i, dropdown) { $('.js-label-select').each(function(i, dropdown) {
var $block, $colorPreview, $dropdown, $form, $loading, $selectbox, $sidebarCollapsedValue, $value, abilityName, defaultLabel, enableLabelCreateButton, issueURLSplit, issueUpdateURL, labelHTMLTemplate, labelNoneHTMLTemplate, labelUrl, namespacePath, projectPath, saveLabelData, selectedLabel, showAny, showNo, $sidebarLabelTooltip, initialSelected, $toggleText, fieldName, useId, propertyName, showMenuAbove, $container; var $block, $colorPreview, $dropdown, $form, $loading, $selectbox, $sidebarCollapsedValue, $value, abilityName, defaultLabel, enableLabelCreateButton, issueURLSplit, issueUpdateURL, labelHTMLTemplate, labelNoneHTMLTemplate, labelUrl, namespacePath, projectPath, saveLabelData, selectedLabel, showAny, showNo, $sidebarLabelTooltip, initialSelected, $toggleText, fieldName, useId, propertyName, showMenuAbove, $container, $dropdownContainer;
$dropdown = $(dropdown); $dropdown = $(dropdown);
$dropdownContainer = $dropdown.closest('.labels-filter'); $dropdownContainer = $dropdown.closest('.labels-filter');
$toggleText = $dropdown.find('.dropdown-toggle-text'); $toggleText = $dropdown.find('.dropdown-toggle-text');

2
app/assets/javascripts/render_math.js
View file

@ -1,4 +1,4 @@
/* eslint-disable func-names, space-before-function-paren, consistent-return, no-var, no-undef, no-else-return, prefer-arrow-callback, padded-blocks, max-len */ /* eslint-disable func-names, space-before-function-paren, consistent-return, no-var, no-undef, no-else-return, prefer-arrow-callback, padded-blocks, max-len, no-console */
// Renders math using KaTeX in any element with the // Renders math using KaTeX in any element with the
// `js-render-math` class // `js-render-math` class
// //