提交 96931b17 编写于 作者: M Mike Greiling

resolve all indent eslint violations

上级 b857b21f
/* eslint-disable func-names, space-before-function-paren, quotes, object-shorthand, camelcase, no-var, comma-dangle, prefer-arrow-callback, indent, object-curly-spacing, quote-props, no-param-reassign, max-len */ /* eslint-disable func-names, space-before-function-paren, quotes, object-shorthand, camelcase, no-var, comma-dangle, prefer-arrow-callback, object-curly-spacing, quote-props, no-param-reassign, max-len */
(function() { (function() {
var Api = { var Api = {
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
return $.ajax({ return $.ajax({
url: url, url: url,
data: $.extend({ data: $.extend({
search: query, search: query,
per_page: 20 per_page: 20
}, options), }, options),
dataType: "json" dataType: "json"
}).done(function(groups) { }).done(function(groups) {
return callback(groups); return callback(groups);
......
/* eslint-disable indent, comma-dangle, object-shorthand, func-names, space-before-function-paren, arrow-parens, no-unused-vars, class-methods-use-this, no-var, consistent-return, prefer-const, no-param-reassign, space-in-parens, max-len */ /* eslint-disable comma-dangle, object-shorthand, func-names, space-before-function-paren, arrow-parens, no-unused-vars, class-methods-use-this, no-var, consistent-return, prefer-const, no-param-reassign, space-in-parens, max-len */
((global) => { ((global) => {
class TemplateSelector { class TemplateSelector {
constructor({ dropdown, data, pattern, wrapper, editor, fileEndpoint, $input } = {}) { constructor({ dropdown, data, pattern, wrapper, editor, fileEndpoint, $input } = {}) {
this.onClick = this.onClick.bind(this); this.onClick = this.onClick.bind(this);
this.dropdown = dropdown; this.dropdown = dropdown;
this.data = data; this.data = data;
this.pattern = pattern; this.pattern = pattern;
this.wrapper = wrapper; this.wrapper = wrapper;
this.editor = editor; this.editor = editor;
this.fileEndpoint = fileEndpoint; this.fileEndpoint = fileEndpoint;
this.$input = $input || $('#file_name'); this.$input = $input || $('#file_name');
this.dropdownIcon = $('.fa-chevron-down', this.dropdown); this.dropdownIcon = $('.fa-chevron-down', this.dropdown);
this.buildDropdown(); this.buildDropdown();
this.bindEvents(); this.bindEvents();
this.onFilenameUpdate(); this.onFilenameUpdate();
this.autosizeUpdateEvent = document.createEvent('Event'); this.autosizeUpdateEvent = document.createEvent('Event');
this.autosizeUpdateEvent.initEvent('autosize:update', true, false); this.autosizeUpdateEvent.initEvent('autosize:update', true, false);
} }
buildDropdown() { buildDropdown() {
return this.dropdown.glDropdown({ return this.dropdown.glDropdown({
data: this.data, data: this.data,
filterable: true, filterable: true,
selectable: true, selectable: true,
toggleLabel: this.toggleLabel, toggleLabel: this.toggleLabel,
search: { search: {
fields: ['name'] fields: ['name']
}, },
clicked: this.onClick, clicked: this.onClick,
text: function(item) { text: function(item) {
return item.name; return item.name;
} }
}); });
} }
bindEvents() { bindEvents() {
return this.$input.on('keyup blur', (e) => this.onFilenameUpdate()); return this.$input.on('keyup blur', (e) => this.onFilenameUpdate());
} }
toggleLabel(item) { toggleLabel(item) {
return item.name; return item.name;
} }
onFilenameUpdate() { onFilenameUpdate() {
var filenameMatches; var filenameMatches;
if (!this.$input.length) { if (!this.$input.length) {
return; return;
}
filenameMatches = this.pattern.test(this.$input.val().trim());
if (!filenameMatches) {
this.wrapper.addClass('hidden');
return;
}
return this.wrapper.removeClass('hidden');
} }
filenameMatches = this.pattern.test(this.$input.val().trim());
onClick(item, el, e) { if (!filenameMatches) {
e.preventDefault(); this.wrapper.addClass('hidden');
return this.requestFile(item); return;
} }
return this.wrapper.removeClass('hidden');
}
requestFile(item) { onClick(item, el, e) {
// This `requestFile` method is an abstract method that should e.preventDefault();
// be added by all subclasses. return this.requestFile(item);
} }
// To be implemented on the extending class requestFile(item) {
// e.g. // This `requestFile` method is an abstract method that should
// Api.gitignoreText item.name, @requestFileSuccess.bind(@) // be added by all subclasses.
requestFileSuccess(file, { skipFocus } = {}) { }
if (!file) return;
const oldValue = this.editor.getValue(); // To be implemented on the extending class
let newValue = file.content; // e.g.
// Api.gitignoreText item.name, @requestFileSuccess.bind(@)
requestFileSuccess(file, { skipFocus } = {}) {
if (!file) return;
this.editor.setValue(newValue, 1); const oldValue = this.editor.getValue();
if (!skipFocus) this.editor.focus(); let newValue = file.content;
if (this.editor instanceof jQuery) { this.editor.setValue(newValue, 1);
this.editor.get(0).dispatchEvent(this.autosizeUpdateEvent); if (!skipFocus) this.editor.focus();
}
}
startLoadingSpinner() { if (this.editor instanceof jQuery) {
this.dropdownIcon this.editor.get(0).dispatchEvent(this.autosizeUpdateEvent);
.addClass('fa-spinner fa-spin')
.removeClass('fa-chevron-down');
} }
}
stopLoadingSpinner() { startLoadingSpinner() {
this.dropdownIcon this.dropdownIcon
.addClass('fa-chevron-down') .addClass('fa-spinner fa-spin')
.removeClass('fa-spinner fa-spin'); .removeClass('fa-chevron-down');
} }
stopLoadingSpinner() {
this.dropdownIcon
.addClass('fa-chevron-down')
.removeClass('fa-spinner fa-spin');
} }
}
global.TemplateSelector = TemplateSelector; global.TemplateSelector = TemplateSelector;
})(window.gl || ( window.gl = {})); })(window.gl || ( window.gl = {}));
/* eslint-disable one-var, indent, quote-props, comma-dangle, space-before-function-paren */ /* eslint-disable one-var, quote-props, comma-dangle, space-before-function-paren */
/* global Vue */ /* global Vue */
/* global BoardService */ /* global BoardService */
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
//= require ./vue_resource_interceptor //= require ./vue_resource_interceptor
$(() => { $(() => {
const $boardApp = document.getElementById('board-app'), const $boardApp = document.getElementById('board-app');
Store = gl.issueBoards.BoardsStore; const Store = gl.issueBoards.BoardsStore;
window.gl = window.gl || {}; window.gl = window.gl || {};
......
/* eslint-disable comma-dangle, space-before-function-paren, one-var, indent, radix */ /* eslint-disable comma-dangle, space-before-function-paren, one-var, radix */
/* global Vue */ /* global Vue */
/* global Sortable */ /* global Sortable */
...@@ -88,8 +88,8 @@ ...@@ -88,8 +88,8 @@
gl.issueBoards.onEnd(); gl.issueBoards.onEnd();
if (e.newIndex !== undefined && e.oldIndex !== e.newIndex) { if (e.newIndex !== undefined && e.oldIndex !== e.newIndex) {
const order = this.sortable.toArray(), const order = this.sortable.toArray();
list = Store.findList('id', parseInt(e.item.dataset.id)); const list = Store.findList('id', parseInt(e.item.dataset.id));
this.$nextTick(() => { this.$nextTick(() => {
Store.moveList(list, order); Store.moveList(list, order);
......
/* eslint-disable comma-dangle, func-names, no-new, space-before-function-paren, one-var, indent */ /* eslint-disable comma-dangle, func-names, no-new, space-before-function-paren, one-var */
(() => { (() => {
window.gl = window.gl || {}; window.gl = window.gl || {};
...@@ -32,17 +32,17 @@ ...@@ -32,17 +32,17 @@
}); });
}, },
renderRow (label) { renderRow (label) {
const active = Store.findList('title', label.title), const active = Store.findList('title', label.title);
$li = $('<li />'), const $li = $('<li />');
$a = $('<a />', { const $a = $('<a />', {
class: (active ? `is-active js-board-list-${active.id}` : ''), class: (active ? `is-active js-board-list-${active.id}` : ''),
text: label.title, text: label.title,
href: '#' href: '#'
}), });
$labelColor = $('<span />', { const $labelColor = $('<span />', {
class: 'dropdown-label-box', class: 'dropdown-label-box',
style: `background-color: ${label.color}` style: `background-color: ${label.color}`
}); });
return $li.append($a.prepend($labelColor)); return $li.append($a.prepend($labelColor));
}, },
......
/* eslint-disable comma-dangle, space-before-function-paren, one-var, indent, space-in-parens, no-shadow, radix, dot-notation, max-len */ /* eslint-disable comma-dangle, space-before-function-paren, one-var, space-in-parens, no-shadow, radix, dot-notation, max-len */
/* global Cookies */ /* global Cookies */
/* global List */ /* global List */
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
return list; return list;
}, },
new (listObj) { new (listObj) {
const list = this.addList(listObj), const list = this.addList(listObj);
backlogList = this.findList('type', 'backlog', 'backlog'); const backlogList = this.findList('type', 'backlog', 'backlog');
list list
.save() .save()
...@@ -93,9 +93,9 @@ ...@@ -93,9 +93,9 @@
listFrom.update(); listFrom.update();
}, },
moveIssueToList (listFrom, listTo, issue, newIndex) { moveIssueToList (listFrom, listTo, issue, newIndex) {
const issueTo = listTo.findIssue(issue.id), const issueTo = listTo.findIssue(issue.id);
issueLists = issue.getLists(), const issueLists = issue.getLists();
listLabels = issueLists.map( listIssue => listIssue.label ); const listLabels = issueLists.map( listIssue => listIssue.label );
// Add to new lists issues if it doesn't already exist // Add to new lists issues if it doesn't already exist
if (!issueTo) { if (!issueTo) {
......
/* eslint-disable wrap-iife, func-names, strict, indent, no-tabs, no-var, vars-on-top, no-param-reassign, object-shorthand, no-shadow, comma-dangle, prefer-template, consistent-return, no-mixed-operators, no-unused-vars, object-curly-spacing, no-unused-expressions, prefer-arrow-callback, max-len */ /* eslint-disable wrap-iife, func-names, strict, no-var, vars-on-top, no-param-reassign, object-shorthand, no-shadow, comma-dangle, prefer-template, consistent-return, no-mixed-operators, no-unused-vars, object-curly-spacing, no-unused-expressions, prefer-arrow-callback, max-len */
(function () { (function () {
'use strict'; 'use strict';
function simulateEvent(el, type, options) { function simulateEvent(el, type, options) {
var event; var event;
if (!el) return; if (!el) return;
var ownerDocument = el.ownerDocument; var ownerDocument = el.ownerDocument;
options = options || {}; options = options || {};
if (/^mouse/.test(type)) { if (/^mouse/.test(type)) {
event = ownerDocument.createEvent('MouseEvents'); event = ownerDocument.createEvent('MouseEvents');
event.initMouseEvent(type, true, true, ownerDocument.defaultView, event.initMouseEvent(type, true, true, ownerDocument.defaultView,
options.button, options.screenX, options.screenY, options.clientX, options.clientY, options.button, options.screenX, options.screenY, options.clientX, options.clientY,
options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, options.button, el); options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, options.button, el);
} else { } else {
event = ownerDocument.createEvent('CustomEvent'); event = ownerDocument.createEvent('CustomEvent');
event.initCustomEvent(type, true, true, ownerDocument.defaultView, event.initCustomEvent(type, true, true, ownerDocument.defaultView,
options.button, options.screenX, options.screenY, options.clientX, options.clientY, options.button, options.screenX, options.screenY, options.clientX, options.clientY,
options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, options.button, el); options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, options.button, el);
event.dataTransfer = { event.dataTransfer = {
data: {}, data: {},
setData: function (type, val) { setData: function (type, val) {
this.data[type] = val; this.data[type] = val;
}, },
getData: function (type) { getData: function (type) {
return this.data[type]; return this.data[type];
} }
}; };
} }
if (el.dispatchEvent) { if (el.dispatchEvent) {
el.dispatchEvent(event); el.dispatchEvent(event);
} else if (el.fireEvent) { } else if (el.fireEvent) {
el.fireEvent('on' + type, event); el.fireEvent('on' + type, event);
} }
return event; return event;
} }
function getTraget(target) { function getTraget(target) {
var el = typeof target.el === 'string' ? document.getElementById(target.el.substr(1)) : target.el; var el = typeof target.el === 'string' ? document.getElementById(target.el.substr(1)) : target.el;
var children = el.children; var children = el.children;
return ( return (
children[target.index] || children[target.index] ||
children[target.index === 'first' ? 0 : -1] || children[target.index === 'first' ? 0 : -1] ||
children[target.index === 'last' ? children.length - 1 : -1] children[target.index === 'last' ? children.length - 1 : -1]
); );
} }
function getRect(el) { function getRect(el) {
var rect = el.getBoundingClientRect(); var rect = el.getBoundingClientRect();
var width = rect.right - rect.left; var width = rect.right - rect.left;
var height = rect.bottom - rect.top; var height = rect.bottom - rect.top;
return { return {
x: rect.left, x: rect.left,
y: rect.top, y: rect.top,
cx: rect.left + width / 2, cx: rect.left + width / 2,
cy: rect.top + height / 2, cy: rect.top + height / 2,
w: width, w: width,
h: height, h: height,
hw: width / 2, hw: width / 2,
wh: height / 2 wh: height / 2
}; };
} }
function simulateDrag(options, callback) { function simulateDrag(options, callback) {
options.to.el = options.to.el || options.from.el; options.to.el = options.to.el || options.from.el;
var fromEl = getTraget(options.from); var fromEl = getTraget(options.from);
var toEl = getTraget(options.to); var toEl = getTraget(options.to);
var scrollable = options.scrollable; var scrollable = options.scrollable;
var fromRect = getRect(fromEl); var fromRect = getRect(fromEl);
var toRect = getRect(toEl); var toRect = getRect(toEl);
var startTime = new Date().getTime(); var startTime = new Date().getTime();
var duration = options.duration || 1000; var duration = options.duration || 1000;
simulateEvent(fromEl, 'mousedown', {button: 0}); simulateEvent(fromEl, 'mousedown', {button: 0});
options.ontap && options.ontap(); options.ontap && options.ontap();
window.SIMULATE_DRAG_ACTIVE = 1; window.SIMULATE_DRAG_ACTIVE = 1;
var dragInterval = setInterval(function loop() { var dragInterval = setInterval(function loop() {
var progress = (new Date().getTime() - startTime) / duration; var progress = (new Date().getTime() - startTime) / duration;
var x = (fromRect.cx + (toRect.cx - fromRect.cx) * progress) - scrollable.scrollLeft; var x = (fromRect.cx + (toRect.cx - fromRect.cx) * progress) - scrollable.scrollLeft;
var y = (fromRect.cy + (toRect.cy - fromRect.cy) * progress) - scrollable.scrollTop; var y = (fromRect.cy + (toRect.cy - fromRect.cy) * progress) - scrollable.scrollTop;
var overEl = fromEl.ownerDocument.elementFromPoint(x, y); var overEl = fromEl.ownerDocument.elementFromPoint(x, y);
simulateEvent(overEl, 'mousemove', { simulateEvent(overEl, 'mousemove', {
clientX: x, clientX: x,
clientY: y clientY: y
}); });
if (progress >= 1) { if (progress >= 1) {
options.ondragend && options.ondragend(); options.ondragend && options.ondragend();
simulateEvent(toEl, 'mouseup'); simulateEvent(toEl, 'mouseup');
clearInterval(dragInterval); clearInterval(dragInterval);
window.SIMULATE_DRAG_ACTIVE = 0; window.SIMULATE_DRAG_ACTIVE = 0;
} }
}, 100); }, 100);
return { return {
target: fromEl, target: fromEl,
fromList: fromEl.parentNode, fromList: fromEl.parentNode,
toList: toEl.parentNode toList: toEl.parentNode
}; };
} }
// Export
// Export window.simulateEvent = simulateEvent;
window.simulateEvent = simulateEvent; window.simulateDrag = simulateDrag;
window.simulateDrag = simulateDrag;
})(); })();
/* eslint-disable comma-dangle, object-shorthand, func-names, no-else-return, guard-for-in, no-restricted-syntax, one-var, indent, space-before-function-paren, no-lonely-if, no-continue, brace-style, max-len, quotes */ /* eslint-disable comma-dangle, object-shorthand, func-names, no-else-return, guard-for-in, no-restricted-syntax, one-var, space-before-function-paren, no-lonely-if, no-continue, brace-style, max-len, quotes */
/* global Vue */ /* global Vue */
/* global DiscussionMixins */ /* global DiscussionMixins */
/* global CommentsStore */ /* global CommentsStore */
...@@ -46,13 +46,13 @@ ...@@ -46,13 +46,13 @@
}, },
methods: { methods: {
jumpToNextUnresolvedDiscussion: function () { jumpToNextUnresolvedDiscussion: function () {
let discussionsSelector, let discussionsSelector;
discussionIdsInScope, let discussionIdsInScope;
firstUnresolvedDiscussionId, let firstUnresolvedDiscussionId;
nextUnresolvedDiscussionId, let nextUnresolvedDiscussionId;
activeTab = window.mrTabs.currentAction, let activeTab = window.mrTabs.currentAction;
hasDiscussionsToJumpTo = true, let hasDiscussionsToJumpTo = true;
jumpToFirstDiscussion = !this.discussionId; let jumpToFirstDiscussion = !this.discussionId;
const discussionIdsForElements = function(elements) { const discussionIdsForElements = function(elements) {
return elements.map(function() { return elements.map(function() {
......
/* eslint-disable class-methods-use-this, one-var, indent, camelcase, no-new, comma-dangle, no-param-reassign, max-len */ /* eslint-disable class-methods-use-this, one-var, camelcase, no-new, comma-dangle, no-param-reassign, max-len */
/* global Vue */ /* global Vue */
/* global Flash */ /* global Flash */
/* global CommentsStore */ /* global CommentsStore */
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
} }
toggleResolveForDiscussion(projectPath, mergeRequestId, discussionId) { toggleResolveForDiscussion(projectPath, mergeRequestId, discussionId) {
const discussion = CommentsStore.state[discussionId], const discussion = CommentsStore.state[discussionId];
isResolved = discussion.isResolved(); const isResolved = discussion.isResolved();
let promise; let promise;
if (isResolved) { if (isResolved) {
......
/* eslint-disable func-names, space-before-function-paren, no-template-curly-in-string, comma-dangle, object-shorthand, quotes, dot-notation, no-else-return, one-var, no-var, no-underscore-dangle, one-var-declaration-per-line, no-param-reassign, no-useless-escape, prefer-template, consistent-return, wrap-iife, prefer-arrow-callback, camelcase, no-unused-vars, no-useless-return, vars-on-top, indent, no-multi-spaces, max-len */ /* eslint-disable func-names, space-before-function-paren, no-template-curly-in-string, comma-dangle, object-shorthand, quotes, dot-notation, no-else-return, one-var, no-var, no-underscore-dangle, one-var-declaration-per-line, no-param-reassign, no-useless-escape, prefer-template, consistent-return, wrap-iife, prefer-arrow-callback, camelcase, no-unused-vars, no-useless-return, vars-on-top, no-multi-spaces, max-len */
// Creates the variables for setting up GFM auto-completion // Creates the variables for setting up GFM auto-completion
(function() { (function() {
......
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-arrow-callback, no-unused-vars, one-var, one-var-declaration-per-line, indent, vars-on-top, max-len */ /* eslint-disable func-names, space-before-function-paren, no-var, prefer-arrow-callback, no-unused-vars, one-var, one-var-declaration-per-line, vars-on-top, max-len */
(function() { (function() {
var hideEndFade; var hideEndFade;
...@@ -27,10 +28,10 @@ ...@@ -27,10 +28,10 @@
}); });
$scrollingTabs.each(function () { $scrollingTabs.each(function () {
var $this = $(this), var $this = $(this);
scrollingTabWidth = $this.width(), var scrollingTabWidth = $this.width();
$active = $this.find('.active'), var $active = $this.find('.active');
activeWidth = $active.width(); var activeWidth = $active.width();
if ($active.length) { if ($active.length) {
var offset = $active.offset().left + activeWidth; var offset = $active.offset().left + activeWidth;
......
/* eslint-disable no-restricted-properties, func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, no-use-before-define, camelcase, no-unused-expressions, quotes, max-len, one-var, one-var-declaration-per-line, default-case, prefer-template, consistent-return, no-alert, no-return-assign, no-param-reassign, prefer-arrow-callback, no-else-return, comma-dangle, no-new, brace-style, no-lonely-if, vars-on-top, no-unused-vars, indent, no-sequences, no-shadow, newline-per-chained-call, no-useless-escape, radix */ /* eslint-disable no-restricted-properties, func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, no-use-before-define, camelcase, no-unused-expressions, quotes, max-len, one-var, one-var-declaration-per-line, default-case, prefer-template, consistent-return, no-alert, no-return-assign, no-param-reassign, prefer-arrow-callback, no-else-return, comma-dangle, no-new, brace-style, no-lonely-if, vars-on-top, no-unused-vars, no-sequences, no-shadow, newline-per-chained-call, no-useless-escape, radix */
/* global Flash */ /* global Flash */
/* global GLForm */ /* global GLForm */
/* global Autosave */ /* global Autosave */
......
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, quotes, consistent-return, no-new, prefer-arrow-callback, no-return-assign, one-var, one-var-declaration-per-line, object-shorthand, comma-dangle, no-else-return, newline-per-chained-call, no-shadow, vars-on-top, indent, prefer-template, max-len */ /* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, quotes, consistent-return, no-new, prefer-arrow-callback, no-return-assign, one-var, one-var-declaration-per-line, object-shorthand, comma-dangle, no-else-return, newline-per-chained-call, no-shadow, vars-on-top, prefer-template, max-len */
/* global Cookies */ /* global Cookies */
/* global Turbolinks */ /* global Turbolinks */
/* global ProjectSelect */ /* global ProjectSelect */
...@@ -96,9 +96,9 @@ ...@@ -96,9 +96,9 @@
clicked: function(selected, $el, e) { clicked: function(selected, $el, e) {
e.preventDefault(); e.preventDefault();
if ($('input[name="ref"]').length) { if ($('input[name="ref"]').length) {
var $form = $dropdown.closest('form'), var $form = $dropdown.closest('form');
action = $form.attr('action'), var action = $form.attr('action');
divider = action.indexOf('?') < 0 ? '?' : '&'; var divider = action.indexOf('?') < 0 ? '?' : '&';
Turbolinks.visit(action + '' + divider + '' + $form.serialize()); Turbolinks.visit(action + '' + divider + '' + $form.serialize());
} }
} }
......
/* eslint-disable func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, no-unused-vars, one-var, indent, no-underscore-dangle, prefer-template, no-else-return, prefer-arrow-callback, radix, max-len */ /* eslint-disable func-names, space-before-function-paren, no-var, space-before-blocks, prefer-rest-params, wrap-iife, no-unused-vars, one-var, no-underscore-dangle, prefer-template, no-else-return, prefer-arrow-callback, radix, max-len */
(function() { (function() {
var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }; var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
...@@ -23,9 +24,10 @@ ...@@ -23,9 +24,10 @@
var self = this; var self = this;
this.$selects.each(function () { this.$selects.each(function () {
var $select = $(this), var $select = $(this);
className = $select.data('field').replace(/_/g, '-') var className = $select.data('field')
.replace('access-level', 'feature'); .replace(/_/g, '-')
.replace('access-level', 'feature');
self._showOrHide($select, '.' + className); self._showOrHide($select, '.' + className);
}); });
}; };
...@@ -45,9 +47,9 @@ ...@@ -45,9 +47,9 @@
}; };
ProjectNew.prototype.toggleRepoVisibility = function () { ProjectNew.prototype.toggleRepoVisibility = function () {
var $repoAccessLevel = $('.js-repo-access-level select'), var $repoAccessLevel = $('.js-repo-access-level select');
containerRegistry = document.querySelectorAll('.js-container-registry')[0], var containerRegistry = document.querySelectorAll('.js-container-registry')[0];
containerRegistryCheckbox = document.getElementById('project_container_registry_enabled'); var containerRegistryCheckbox = document.getElementById('project_container_registry_enabled');
this.$repoSelects.find("option[value='" + $repoAccessLevel.val() + "']") this.$repoSelects.find("option[value='" + $repoAccessLevel.val() + "']")
.nextAll() .nextAll()
...@@ -58,8 +60,8 @@ ...@@ -58,8 +60,8 @@
var selectedVal = parseInt($repoAccessLevel.val()); var selectedVal = parseInt($repoAccessLevel.val());
this.$repoSelects.each(function () { this.$repoSelects.each(function () {
var $this = $(this), var $this = $(this);
repoSelectVal = parseInt($this.val()); var repoSelectVal = parseInt($this.val());
$this.find('option').show(); $this.find('option').show();
......
/* eslint-disable comma-dangle, no-return-assign, one-var, no-var, no-underscore-dangle, one-var-declaration-per-line, no-unused-vars, no-cond-assign, consistent-return, object-shorthand, prefer-arrow-callback, func-names, space-before-function-paren, prefer-template, quotes, class-methods-use-this, no-unused-expressions, no-sequences, wrap-iife, no-lonely-if, no-else-return, no-param-reassign, vars-on-top, indent, max-len */ /* eslint-disable comma-dangle, no-return-assign, one-var, no-var, no-underscore-dangle, one-var-declaration-per-line, no-unused-vars, no-cond-assign, consistent-return, object-shorthand, prefer-arrow-callback, func-names, space-before-function-paren, prefer-template, quotes, class-methods-use-this, no-unused-expressions, no-sequences, wrap-iife, no-lonely-if, no-else-return, no-param-reassign, vars-on-top, max-len */
((global) => { ((global) => {
const KEYCODE = { const KEYCODE = {
...@@ -279,12 +279,12 @@ ...@@ -279,12 +279,12 @@
return this.searchInput.val(); return this.searchInput.val();
} }
onClearInputClick(e) { onClearInputClick(e) {
e.preventDefault(); e.preventDefault();
return this.searchInput.val('').focus(); return this.searchInput.val('').focus();
} }
onSearchInputBlur(e) { onSearchInputBlur(e) {
this.isFocused = false; this.isFocused = false;
this.wrap.removeClass('search-active'); this.wrap.removeClass('search-active');
// If input is blank then restore state // If input is blank then restore state
......
/* eslint-disable comma-dangle, one-var, no-unused-vars, indent */ /* eslint-disable comma-dangle, one-var, no-unused-vars */
/* global Vue */ /* global Vue */
/* global BoardService */ /* global BoardService */
/* global boardsMockInterceptor */ /* global boardsMockInterceptor */
...@@ -146,8 +146,8 @@ describe('Store', () => { ...@@ -146,8 +146,8 @@ describe('Store', () => {
}); });
it('moves the position of lists', () => { it('moves the position of lists', () => {
const listOne = gl.issueBoards.BoardsStore.addList(listObj), const listOne = gl.issueBoards.BoardsStore.addList(listObj);
listTwo = gl.issueBoards.BoardsStore.addList(listObjDuplicate); const listTwo = gl.issueBoards.BoardsStore.addList(listObjDuplicate);
expect(gl.issueBoards.BoardsStore.state.lists.length).toBe(2); expect(gl.issueBoards.BoardsStore.state.lists.length).toBe(2);
...@@ -157,8 +157,8 @@ describe('Store', () => { ...@@ -157,8 +157,8 @@ describe('Store', () => {
}); });
it('moves an issue from one list to another', (done) => { it('moves an issue from one list to another', (done) => {
const listOne = gl.issueBoards.BoardsStore.addList(listObj), const listOne = gl.issueBoards.BoardsStore.addList(listObj);
listTwo = gl.issueBoards.BoardsStore.addList(listObjDuplicate); const listTwo = gl.issueBoards.BoardsStore.addList(listObjDuplicate);
expect(gl.issueBoards.BoardsStore.state.lists.length).toBe(2); expect(gl.issueBoards.BoardsStore.state.lists.length).toBe(2);
......
/* eslint-disable space-before-function-paren, arrow-body-style, indent */ /* eslint-disable space-before-function-paren, arrow-body-style */
//= require jquery //= require jquery
//= require gl_field_errors //= require gl_field_errors
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
expect(customErrorElem.length).toBe(1); expect(customErrorElem.length).toBe(1);
const customErrors = this.fieldErrors.state.inputs.filter((input) => { const customErrors = this.fieldErrors.state.inputs.filter((input) => {
return input.inputElement.hasClass(customErrorFlag); return input.inputElement.hasClass(customErrorFlag);
}); });
expect(customErrors.length).toBe(0); expect(customErrors.length).toBe(0);
}); });
......
/* eslint-disable quotes, indent, object-curly-spacing, jasmine/no-suite-dupes, vars-on-top, no-var, spaced-comment, max-len */ /* eslint-disable quotes, object-curly-spacing, jasmine/no-suite-dupes, vars-on-top, no-var, spaced-comment, max-len */
/* global d3 */ /* global d3 */
/* global ContributorsGraph */ /* global ContributorsGraph */
/* global ContributorsMasterGraph */ /* global ContributorsMasterGraph */
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
describe("ContributorsGraph", function () { describe("ContributorsGraph", function () {
describe("#set_x_domain", function () { describe("#set_x_domain", function () {
it("set the x_domain", function () { it("set the x_domain", function () {
ContributorsGraph.set_x_domain(20); ContributorsGraph.set_x_domain(20);
expect(ContributorsGraph.prototype.x_domain).toEqual(20); expect(ContributorsGraph.prototype.x_domain).toEqual(20);
}); });
}); });
describe("#set_y_domain", function () { describe("#set_y_domain", function () {
it("sets the y_domain", function () { it("sets the y_domain", function () {
......
/* eslint-disable quotes, no-var, camelcase, object-curly-spacing, indent, object-property-newline, comma-dangle, comma-spacing, spaced-comment, max-len, key-spacing, vars-on-top, quote-props, no-multi-spaces */ /* eslint-disable quotes, no-var, camelcase, object-curly-spacing, object-property-newline, comma-dangle, comma-spacing, spaced-comment, max-len, key-spacing, vars-on-top, quote-props, no-multi-spaces */
/* global ContributorsStatGraphUtil */ /* global ContributorsStatGraphUtil */
//= require graphs/stat_graph_contributors_util //= require graphs/stat_graph_contributors_util
...@@ -18,14 +18,14 @@ describe("ContributorsStatGraphUtil", function () { ...@@ -18,14 +18,14 @@ describe("ContributorsStatGraphUtil", function () {
{date: "2013-05-08", additions: 54, deletions: 7, commits: 3}], {date: "2013-05-08", additions: 54, deletions: 7, commits: 3}],
by_author: by_author:
[ [
{ {
author_name: "Karlo Soriano", author_email: "karlo@email.com", author_name: "Karlo Soriano", author_email: "karlo@email.com",
"2013-05-09": {date: "2013-05-09", additions: 471, deletions: 0, commits: 1} "2013-05-09": {date: "2013-05-09", additions: 471, deletions: 0, commits: 1}
}, },
{ {
author_name: "Dmitriy Zaporozhets",author_email: "dzaporozhets@email.com", author_name: "Dmitriy Zaporozhets",author_email: "dzaporozhets@email.com",
"2013-05-08": {date: "2013-05-08", additions: 54, deletions: 7, commits: 3} "2013-05-08": {date: "2013-05-08", additions: 54, deletions: 7, commits: 3}
} }
] ]
}; };
expect(ContributorsStatGraphUtil.parse_log(fake_log)).toEqual(correct_parsed_log); expect(ContributorsStatGraphUtil.parse_log(fake_log)).toEqual(correct_parsed_log);
...@@ -129,18 +129,21 @@ describe("ContributorsStatGraphUtil", function () { ...@@ -129,18 +129,21 @@ describe("ContributorsStatGraphUtil", function () {
describe("#get_total_data", function () { describe("#get_total_data", function () {
it("returns the collection sorted via specified field", function () { it("returns the collection sorted via specified field", function () {
var fake_parsed_log = { var fake_parsed_log = {
total: [{date: "2013-05-09", additions: 471, deletions: 0, commits: 1}, total: [
{date: "2013-05-08", additions: 54, deletions: 7, commits: 3}], {date: "2013-05-09", additions: 471, deletions: 0, commits: 1},
by_author:[ {date: "2013-05-08", additions: 54, deletions: 7, commits: 3}
{ ],
author: "Karlo Soriano", by_author:[
"2013-05-09": {date: "2013-05-09", additions: 471, deletions: 0, commits: 1} {
}, author: "Karlo Soriano",
{ "2013-05-09": {date: "2013-05-09", additions: 471, deletions: 0, commits: 1}
author: "Dmitriy Zaporozhets", },
"2013-05-08": {date: "2013-05-08", additions: 54, deletions: 7, commits: 3} {
} author: "Dmitriy Zaporozhets",
]}; "2013-05-08": {date: "2013-05-08", additions: 54, deletions: 7, commits: 3}
}
]
};
var correct_total_data = [{date: "2013-05-08", commits: 3}, var correct_total_data = [{date: "2013-05-08", commits: 3},
{date: "2013-05-09", commits: 1}]; {date: "2013-05-09", commits: 1}];
expect(ContributorsStatGraphUtil.get_total_data(fake_parsed_log, "commits")).toEqual(correct_total_data); expect(ContributorsStatGraphUtil.get_total_data(fake_parsed_log, "commits")).toEqual(correct_total_data);
......
/* eslint-disable space-before-function-paren, no-var, one-var, one-var-declaration-per-line, no-use-before-define, indent, comma-dangle, max-len */ /* eslint-disable space-before-function-paren, no-var, one-var, one-var-declaration-per-line, no-use-before-define, comma-dangle, max-len */
/* global Issue */ /* global Issue */
/*= require lib/utils/text_utility */ /*= require lib/utils/text_utility */
...@@ -42,21 +42,21 @@ ...@@ -42,21 +42,21 @@
} }
function findElements() { function findElements() {
$boxClosed = $('div.status-box-closed'); $boxClosed = $('div.status-box-closed');
expect($boxClosed).toExist(); expect($boxClosed).toExist();
expect($boxClosed).toHaveText('Closed'); expect($boxClosed).toHaveText('Closed');
$boxOpen = $('div.status-box-open'); $boxOpen = $('div.status-box-open');
expect($boxOpen).toExist(); expect($boxOpen).toExist();
expect($boxOpen).toHaveText('Open'); expect($boxOpen).toHaveText('Open');
$btnClose = $('.btn-close.btn-grouped'); $btnClose = $('.btn-close.btn-grouped');
expect($btnClose).toExist(); expect($btnClose).toExist();
expect($btnClose).toHaveText('Close issue'); expect($btnClose).toHaveText('Close issue');
$btnReopen = $('.btn-reopen.btn-grouped'); $btnReopen = $('.btn-reopen.btn-grouped');
expect($btnReopen).toExist(); expect($btnReopen).toExist();
expect($btnReopen).toHaveText('Reopen issue'); expect($btnReopen).toHaveText('Reopen issue');
} }
describe('Issue', function() { describe('Issue', function() {
......
/* eslint-disable space-before-function-paren, quotes, comma-dangle, dot-notation, indent, quote-props, no-var, max-len */ /* eslint-disable space-before-function-paren, quotes, comma-dangle, dot-notation, quote-props, no-var, max-len */
/*= require merge_request_widget */ /*= require merge_request_widget */
/*= require lib/utils/datetime_utility */ /*= require lib/utils/datetime_utility */
...@@ -42,17 +42,17 @@ ...@@ -42,17 +42,17 @@
}); });
it('should call renderEnvironments when the environments property is set', function() { it('should call renderEnvironments when the environments property is set', function() {
const spy = spyOn(this.class, 'renderEnvironments').and.stub(); const spy = spyOn(this.class, 'renderEnvironments').and.stub();
this.class.getCIEnvironmentsStatus(); this.class.getCIEnvironmentsStatus();
expect(spy).toHaveBeenCalledWith(this.ciEnvironmentsStatusData); expect(spy).toHaveBeenCalledWith(this.ciEnvironmentsStatusData);
}); });
it('should not call renderEnvironments when the environments property is not set', function() { it('should not call renderEnvironments when the environments property is not set', function() {
this.ciEnvironmentsStatusData = null; this.ciEnvironmentsStatusData = null;
const spy = spyOn(this.class, 'renderEnvironments').and.stub(); const spy = spyOn(this.class, 'renderEnvironments').and.stub();
this.class.getCIEnvironmentsStatus(); this.class.getCIEnvironmentsStatus();
expect(spy).not.toHaveBeenCalled(); expect(spy).not.toHaveBeenCalled();
}); });
}); });
describe('renderEnvironments', function() { describe('renderEnvironments', function() {
...@@ -107,16 +107,16 @@ ...@@ -107,16 +107,16 @@
}); });
describe('mergeInProgress', function() { describe('mergeInProgress', function() {
it('should display error with h4 tag', function() { it('should display error with h4 tag', function() {
spyOn(this.class.$widgetBody, 'html').and.callFake(function(html) { spyOn(this.class.$widgetBody, 'html').and.callFake(function(html) {
expect(html).toBe('<h4>Sorry, something went wrong.</h4>'); expect(html).toBe('<h4>Sorry, something went wrong.</h4>');
}); });
spyOn($, 'ajax').and.callFake(function(e) { spyOn($, 'ajax').and.callFake(function(e) {
e.success({ merge_error: 'Sorry, something went wrong.' }); e.success({ merge_error: 'Sorry, something went wrong.' });
});
this.class.mergeInProgress(null);
}); });
this.class.mergeInProgress(null);
}); });
});
return describe('getCIStatus', function() { return describe('getCIStatus', function() {
beforeEach(function() { beforeEach(function() {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册