Make things prettier

5 files changed, 147 insertions, 107 deletions

diff --git a/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js b/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js
index 75cf90de0b5..adb3463945f 100644
--- a/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js
+++ b/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js
@@ -34,7 +34,7 @@ const gfmRules = {
     },
   },
   AutolinkFilter: {
-    'a'(el, text) {
+    a(el, text) {
       // Fallback on the regular MarkdownFilter's `a` handler.
       if (text !== el.getAttribute('href')) return false;
 
@@ -60,7 +60,7 @@ const gfmRules = {
     },
   },
   ImageLazyLoadFilter: {
-    'img'(el, text) {
+    img(el, text) {
       return `![${el.getAttribute('alt')}](${el.getAttribute('src')})`;
     },
   },
@@ -71,7 +71,7 @@ const gfmRules = {
 
       return CopyAsGFM.nodeToGFM(videoEl);
     },
-    'video'(el) {
+    video(el) {
       return `![${el.dataset.title}](${el.getAttribute('src')})`;
     },
   },
@@ -118,11 +118,11 @@ const gfmRules = {
     'a[name]:not([href]):empty'(el) {
       return el.outerHTML;
     },
-    'dl'(el, text) {
+    dl(el, text) {
       let lines = text.trim().split('\n');
       // Add two spaces to the front of subsequent list items lines,
       // or leave the line entirely blank.
-      lines = lines.map((l) => {
+      lines = lines.map(l => {
         const line = l.trim();
         if (line.length === 0) return '';
 
@@ -147,27 +147,30 @@ const gfmRules = {
 
       // Prefixes lines with 4 spaces if the code contains triple backticks
       if (lang === '' && text.match(/^```/gm)) {
-        return text.split('\n').map((l) => {
-          const line = l.trim();
-          if (line.length === 0) return '';
-
-          return `    ${line}`;
-        }).join('\n');
+        return text
+          .split('\n')
+          .map(l => {
+            const line = l.trim();
+            if (line.length === 0) return '';
+
+            return `    ${line}`;
+          })
+          .join('\n');
       }
 
       return `\`\`\`${lang}\n${text}\n\`\`\``;
     },
     'pre > code'(el, text) {
-       // Don't wrap code blocks in ``
+      // Don't wrap code blocks in ``
       return text;
     },
   },
   MarkdownFilter: {
-    'br'(el) {
+    br(el) {
       // Two spaces at the end of a line are turned into a BR
       return '  ';
     },
-    'code'(el, text) {
+    code(el, text) {
       let backtickCount = 1;
       const backtickMatch = text.match(/`+/);
       if (backtickMatch) {
@@ -179,27 +182,31 @@ const gfmRules = {
 
       return backticks + spaceOrNoSpace + text.trim() + spaceOrNoSpace + backticks;
     },
-    'blockquote'(el, text) {
-      return text.trim().split('\n').map(s => `> ${s}`.trim()).join('\n');
+    blockquote(el, text) {
+      return text
+        .trim()
+        .split('\n')
+        .map(s => `> ${s}`.trim())
+        .join('\n');
     },
-    'img'(el) {
+    img(el) {
       const imageSrc = el.src;
-      const imageUrl = imageSrc && imageSrc !== placeholderImage ? imageSrc : (el.dataset.src || '');
+      const imageUrl = imageSrc && imageSrc !== placeholderImage ? imageSrc : el.dataset.src || '';
       return `![${el.getAttribute('alt')}](${imageUrl})`;
     },
     'a.anchor'(el, text) {
       // Don't render a Markdown link for the anchor link inside a heading
       return text;
     },
-    'a'(el, text) {
+    a(el, text) {
       return `[${text}](${el.getAttribute('href')})`;
     },
-    'li'(el, text) {
+    li(el, text) {
       const lines = text.trim().split('\n');
       const firstLine = `- ${lines.shift()}`;
       // Add four spaces to the front of subsequent list items lines,
       // or leave the line entirely blank.
-      const nextLines = lines.map((s) => {
+      const nextLines = lines.map(s => {
         if (s.trim().length === 0) return '';
 
         return `    ${s}`;
@@ -207,47 +214,47 @@ const gfmRules = {
 
       return `${firstLine}\n${nextLines.join('\n')}`;
     },
-    'ul'(el, text) {
+    ul(el, text) {
       return text;
     },
-    'ol'(el, text) {
+    ol(el, text) {
       // LIs get a `- ` prefix by default, which we replace by `1. ` for ordered lists.
-      return text.replace(/^- /mg, '1. ');
+      return text.replace(/^- /gm, '1. ');
     },
-    'h1'(el, text) {
+    h1(el, text) {
       return `# ${text.trim()}`;
     },
-    'h2'(el, text) {
+    h2(el, text) {
       return `## ${text.trim()}`;
     },
-    'h3'(el, text) {
+    h3(el, text) {
       return `### ${text.trim()}`;
     },
-    'h4'(el, text) {
+    h4(el, text) {
       return `#### ${text.trim()}`;
     },
-    'h5'(el, text) {
+    h5(el, text) {
       return `##### ${text.trim()}`;
     },
-    'h6'(el, text) {
+    h6(el, text) {
       return `###### ${text.trim()}`;
     },
-    'strong'(el, text) {
+    strong(el, text) {
       return `**${text}**`;
     },
-    'em'(el, text) {
+    em(el, text) {
       return `_${text}_`;
     },
-    'del'(el, text) {
+    del(el, text) {
       return `~~${text}~~`;
     },
-    'sup'(el, text) {
+    sup(el, text) {
       return `^${text}`;
     },
-    'hr'(el) {
+    hr(el) {
       return '-----';
     },
-    'table'(el) {
+    table(el) {
       const theadEl = el.querySelector('thead');
       const tbodyEl = el.querySelector('tbody');
       if (!theadEl || !tbodyEl) return false;
@@ -257,8 +264,8 @@ const gfmRules = {
 
       return [theadText, tbodyText].join('\n');
     },
-    'thead'(el, text) {
-      const cells = _.map(el.querySelectorAll('th'), (cell) => {
+    thead(el, text) {
+      const cells = _.map(el.querySelectorAll('th'), cell => {
         let chars = CopyAsGFM.nodeToGFM(cell).length + 2;
 
         let before = '';
@@ -288,7 +295,7 @@ const gfmRules = {
 
       return [text, separatorRow].join('\n');
     },
-    'tr'(el) {
+    tr(el) {
       const cellEls = el.querySelectorAll('td, th');
       if (cellEls.length === 0) return false;
 
@@ -307,8 +314,12 @@ export class CopyAsGFM {
     const isIOS = /\b(iPad|iPhone|iPod)(?=;)/.test(userAgent);
     if (isIOS) return;
 
-    $(document).on('copy', '.md, .wiki', (e) => { CopyAsGFM.copyAsGFM(e, CopyAsGFM.transformGFMSelection); });
-    $(document).on('copy', 'pre.code.highlight, .diff-content .line_content', (e) => { CopyAsGFM.copyAsGFM(e, CopyAsGFM.transformCodeSelection); });
+    $(document).on('copy', '.md, .wiki', e => {
+      CopyAsGFM.copyAsGFM(e, CopyAsGFM.transformGFMSelection);
+    });
+    $(document).on('copy', 'pre.code.highlight, .diff-content .line_content', e => {
+      CopyAsGFM.copyAsGFM(e, CopyAsGFM.transformCodeSelection);
+    });
     $(document).on('paste', '.js-gfm-input', CopyAsGFM.pasteGFM);
   }
 
@@ -348,7 +359,7 @@ export class CopyAsGFM {
       // This will break down when the actual code block contains an uneven
       // number of backticks, but this is a rare edge case.
       const backtickMatch = textBefore.match(/`/g);
-      const insideCodeBlock = backtickMatch && (backtickMatch.length % 2) === 1;
+      const insideCodeBlock = backtickMatch && backtickMatch.length % 2 === 1;
 
       if (insideCodeBlock) {
         return text;
@@ -385,7 +396,9 @@ export class CopyAsGFM {
     let lineSelector = '.line';
 
     if (target) {
-      const lineClass = ['left-side', 'right-side'].filter(name => target.classList.contains(name))[0];
+      const lineClass = ['left-side', 'right-side'].filter(name =>
+        target.classList.contains(name),
+      )[0];
       if (lineClass) {
         lineSelector = `.line_content.${lineClass} ${lineSelector}`;
       }
@@ -428,7 +441,8 @@ export class CopyAsGFM {
       return node.textContent;
     }
 
-    const respectWhitespace = respectWhitespaceParam || (node.nodeName === 'PRE' || node.nodeName === 'CODE');
+    const respectWhitespace =
+      respectWhitespaceParam || (node.nodeName === 'PRE' || node.nodeName === 'CODE');
 
     const text = this.innerGFM(node, respectWhitespace);
 
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 2c80baba10b..ba3ec86d9fd 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -52,10 +52,14 @@ document.addEventListener('beforeunload', () => {
 });
 
 window.addEventListener('hashchange', handleLocationHash);
-window.addEventListener('load', function onLoad() {
-  window.removeEventListener('load', onLoad, false);
-  handleLocationHash();
-}, false);
+window.addEventListener(
+  'load',
+  function onLoad() {
+    window.removeEventListener('load', onLoad, false);
+    handleLocationHash();
+  },
+  false,
+);
 
 gl.lazyLoader = new LazyLoader({
   scrollContainer: window,
@@ -89,9 +93,7 @@ document.addEventListener('DOMContentLoaded', () => {
   if (bootstrapBreakpoint === 'xs') {
     const $rightSidebar = $('aside.right-sidebar, .layout-page');
 
-    $rightSidebar
-      .removeClass('right-sidebar-expanded')
-      .addClass('right-sidebar-collapsed');
+    $rightSidebar.removeClass('right-sidebar-expanded').addClass('right-sidebar-collapsed');
   }
 
   // prevent default action for disabled buttons
@@ -108,7 +110,8 @@ document.addEventListener('DOMContentLoaded', () => {
   addSelectOnFocusBehaviour('.js-select-on-focus');
 
   $('.remove-row').on('ajax:success', function removeRowAjaxSuccessCallback() {
-    $(this).tooltip('destroy')
+    $(this)
+      .tooltip('destroy')
       .closest('li')
       .fadeOut();
   });
@@ -118,7 +121,9 @@ document.addEventListener('DOMContentLoaded', () => {
   });
 
   $('.js-remove-tr').on('ajax:success', function removeTRAjaxSuccessCallback() {
-    $(this).closest('tr').fadeOut();
+    $(this)
+      .closest('tr')
+      .fadeOut();
   });
 
   // Initialize select2 selects
@@ -155,7 +160,9 @@ document.addEventListener('DOMContentLoaded', () => {
 
   // Form submitter
   $('.trigger-submit').on('change', function triggerSubmitCallback() {
-    $(this).parents('form').submit();
+    $(this)
+      .parents('form')
+      .submit();
   });
 
   localTimeAgo($('abbr.timeago, .js-timeago'), true);
@@ -204,9 +211,15 @@ document.addEventListener('DOMContentLoaded', () => {
     $this.toggleClass('active');
 
     if ($this.hasClass('active')) {
-      notesHolders.show().find('.hide, .content').show();
+      notesHolders
+        .show()
+        .find('.hide, .content')
+        .show();
     } else {
-      notesHolders.hide().find('.content').hide();
+      notesHolders
+        .hide()
+        .find('.content')
+        .hide();
     }
 
     $(document).trigger('toggle.comments');
@@ -247,9 +260,11 @@ document.addEventListener('DOMContentLoaded', () => {
   const flashContainer = document.querySelector('.flash-container');
 
   if (flashContainer && flashContainer.children.length) {
-    flashContainer.querySelectorAll('.flash-alert, .flash-notice, .flash-success').forEach((flashEl) => {
-      removeFlashClickListener(flashEl);
-    });
+    flashContainer
+      .querySelectorAll('.flash-alert, .flash-notice, .flash-success')
+      .forEach(flashEl => {
+        removeFlashClickListener(flashEl);
+      });
   }
 
   initDispatcher();
diff --git a/app/assets/javascripts/smart_interval.js b/app/assets/javascripts/smart_interval.js
index 77ab7c964e6..8b94303ec9c 100644
--- a/app/assets/javascripts/smart_interval.js
+++ b/app/assets/javascripts/smart_interval.js
@@ -94,7 +94,9 @@ export default class SmartInterval {
   destroy() {
     this.cancel();
     document.removeEventListener('visibilitychange', this.handleVisibilityChange);
-    $(document).off('visibilitychange').off('beforeunload');
+    $(document)
+      .off('visibilitychange')
+      .off('beforeunload');
   }
 
   /* private */
@@ -112,11 +114,12 @@ export default class SmartInterval {
 
   triggerCallback() {
     this.isLoading = true;
-    this.cfg.callback()
+    this.cfg
+      .callback()
       .then(() => {
         this.isLoading = false;
       })
-      .catch((err) => {
+      .catch(err => {
         this.isLoading = false;
         throw err;
       });
@@ -135,9 +138,9 @@ export default class SmartInterval {
 
   handleVisibilityChange(e) {
     this.state.pageVisibility = e.target.visibilityState;
-    const intervalAction = this.isPageVisible() ?
-      this.onVisibilityVisible :
-      this.onVisibilityHidden;
+    const intervalAction = this.isPageVisible()
+      ? this.onVisibilityVisible
+      : this.onVisibilityHidden;
 
     intervalAction.apply(this);
   }
@@ -163,7 +166,9 @@ export default class SmartInterval {
     this.setCurrentInterval(nextInterval);
   }
 
-  isPageVisible() { return this.state.pageVisibility === 'visible'; }
+  isPageVisible() {
+    return this.state.pageVisibility === 'visible';
+  }
 
   stopTimer() {
     const state = this.state;
@@ -171,4 +176,3 @@ export default class SmartInterval {
     state.intervalId = window.clearInterval(state.intervalId);
   }
 }
-
diff --git a/spec/javascripts/smart_interval_spec.js b/spec/javascripts/smart_interval_spec.js
index a54219d58c2..00a46d3e07f 100644
--- a/spec/javascripts/smart_interval_spec.js
+++ b/spec/javascripts/smart_interval_spec.js
@@ -2,7 +2,7 @@ import $ from 'jquery';
 import _ from 'underscore';
 import SmartInterval from '~/smart_interval';
 
-describe('SmartInterval', function () {
+describe('SmartInterval', function() {
   const DEFAULT_MAX_INTERVAL = 100;
   const DEFAULT_STARTING_INTERVAL = 5;
   const DEFAULT_SHORT_TIMEOUT = 75;
@@ -27,18 +27,19 @@ describe('SmartInterval', function () {
     return new SmartInterval(defaultParams);
   }
 
-  describe('Increment Interval', function () {
-    beforeEach(function () {
+  describe('Increment Interval', function() {
+    beforeEach(function() {
       this.smartInterval = createDefaultSmartInterval();
     });
 
-    it('should increment the interval delay', function (done) {
+    it('should increment the interval delay', function(done) {
       const interval = this.smartInterval;
       setTimeout(() => {
         const intervalConfig = this.smartInterval.cfg;
         const iterationCount = 4;
-        const maxIntervalAfterIterations = intervalConfig.startingInterval *
-          (intervalConfig.incrementByFactorOf ** (iterationCount - 1)); // 40
+        const maxIntervalAfterIterations =
+          intervalConfig.startingInterval *
+          intervalConfig.incrementByFactorOf ** (iterationCount - 1); // 40
         const currentInterval = interval.getCurrentInterval();
 
         // Provide some flexibility for performance of testing environment
@@ -49,7 +50,7 @@ describe('SmartInterval', function () {
       }, DEFAULT_SHORT_TIMEOUT); // 4 iterations, increment by 2x = (5 + 10 + 20 + 40)
     });
 
-    it('should not increment past maxInterval', function (done) {
+    it('should not increment past maxInterval', function(done) {
       const interval = this.smartInterval;
 
       setTimeout(() => {
@@ -60,7 +61,7 @@ describe('SmartInterval', function () {
       }, DEFAULT_LONG_TIMEOUT);
     });
 
-    it('does not increment while waiting for callback', function () {
+    it('does not increment while waiting for callback', function() {
       jasmine.clock().install();
 
       const smartInterval = createDefaultSmartInterval({
@@ -76,12 +77,12 @@ describe('SmartInterval', function () {
     });
   });
 
-  describe('Public methods', function () {
-    beforeEach(function () {
+  describe('Public methods', function() {
+    beforeEach(function() {
       this.smartInterval = createDefaultSmartInterval();
     });
 
-    it('should cancel an interval', function (done) {
+    it('should cancel an interval', function(done) {
       const interval = this.smartInterval;
 
       setTimeout(() => {
@@ -98,7 +99,7 @@ describe('SmartInterval', function () {
       }, DEFAULT_SHORT_TIMEOUT);
     });
 
-    it('should resume an interval', function (done) {
+    it('should resume an interval', function(done) {
       const interval = this.smartInterval;
 
       setTimeout(() => {
@@ -115,15 +116,15 @@ describe('SmartInterval', function () {
     });
   });
 
-  describe('DOM Events', function () {
-    beforeEach(function () {
+  describe('DOM Events', function() {
+    beforeEach(function() {
       // This ensures DOM and DOM events are initialized for these specs.
       setFixtures('<div></div>');
 
       this.smartInterval = createDefaultSmartInterval();
     });
 
-    it('should pause when page is not visible', function (done) {
+    it('should pause when page is not visible', function(done) {
       const interval = this.smartInterval;
 
       setTimeout(() => {
@@ -137,14 +138,16 @@ describe('SmartInterval', function () {
       }, DEFAULT_SHORT_TIMEOUT);
     });
 
-    it('should change to the hidden interval when page is not visible', function (done) {
+    it('should change to the hidden interval when page is not visible', function(done) {
       const HIDDEN_INTERVAL = 1500;
       const interval = createDefaultSmartInterval({ hiddenInterval: HIDDEN_INTERVAL });
 
       setTimeout(() => {
         expect(interval.state.intervalId).toBeTruthy();
-        expect(interval.getCurrentInterval() >= DEFAULT_STARTING_INTERVAL &&
-          interval.getCurrentInterval() <= DEFAULT_MAX_INTERVAL).toBeTruthy();
+        expect(
+          interval.getCurrentInterval() >= DEFAULT_STARTING_INTERVAL &&
+            interval.getCurrentInterval() <= DEFAULT_MAX_INTERVAL,
+        ).toBeTruthy();
 
         // simulates triggering of visibilitychange event
         interval.handleVisibilityChange({ target: { visibilityState: 'hidden' } });
@@ -155,7 +158,7 @@ describe('SmartInterval', function () {
       }, DEFAULT_SHORT_TIMEOUT);
     });
 
-    it('should resume when page is becomes visible at the previous interval', function (done) {
+    it('should resume when page is becomes visible at the previous interval', function(done) {
       const interval = this.smartInterval;
 
       setTimeout(() => {
@@ -175,7 +178,7 @@ describe('SmartInterval', function () {
       }, DEFAULT_SHORT_TIMEOUT);
     });
 
-    it('should cancel on page unload', function (done) {
+    it('should cancel on page unload', function(done) {
       const interval = this.smartInterval;
 
       setTimeout(() => {
@@ -186,7 +189,7 @@ describe('SmartInterval', function () {
       }, DEFAULT_SHORT_TIMEOUT);
     });
 
-    it('should execute callback before first interval', function () {
+    it('should execute callback before first interval', function() {
       const interval = createDefaultSmartInterval({ immediateExecution: true });
       expect(interval.cfg.immediateExecution).toBeFalsy();
     });
diff --git a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
index e55c7649d40..c0506337e1c 100644
--- a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
+++ b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
@@ -6,11 +6,12 @@ import { stateKey } from '~/vue_merge_request_widget/stores/state_maps';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
 import mockData from './mock_data';
 
-const returnPromise = data => new Promise((resolve) => {
-  resolve({
-    data,
+const returnPromise = data =>
+  new Promise(resolve => {
+    resolve({
+      data,
+    });
   });
-});
 
 describe('mrWidgetOptions', () => {
   let vm;
@@ -127,7 +128,7 @@ describe('mrWidgetOptions', () => {
 
   describe('methods', () => {
     describe('checkStatus', () => {
-      it('should tell service to check status', (done) => {
+      it('should tell service to check status', done => {
         spyOn(vm.service, 'checkStatus').and.returnValue(returnPromise(mockData));
         spyOn(vm.mr, 'setData');
         spyOn(vm, 'handleNotification');
@@ -177,7 +178,7 @@ describe('mrWidgetOptions', () => {
     });
 
     describe('fetchDeployments', () => {
-      it('should fetch deployments', (done) => {
+      it('should fetch deployments', done => {
         spyOn(vm.service, 'fetchDeployments').and.returnValue(returnPromise([{ id: 1 }]));
 
         vm.fetchDeployments();
@@ -192,7 +193,7 @@ describe('mrWidgetOptions', () => {
     });
 
     describe('fetchActionsContent', () => {
-      it('should fetch content of Cherry Pick and Revert modals', (done) => {
+      it('should fetch content of Cherry Pick and Revert modals', done => {
         spyOn(vm.service, 'fetchMergeActionsContent').and.returnValue(returnPromise('hello world'));
 
         vm.fetchActionsContent();
@@ -238,7 +239,7 @@ describe('mrWidgetOptions', () => {
         };
 
         const allArgs = eventHub.$on.calls.allArgs();
-        allArgs.forEach((params) => {
+        allArgs.forEach(params => {
           const eventName = params[0];
           const callback = params[1];
 
@@ -358,7 +359,7 @@ describe('mrWidgetOptions', () => {
   });
 
   describe('rendering relatedLinks', () => {
-    beforeEach((done) => {
+    beforeEach(done => {
       vm.mr.relatedLinks = {
         assignToMe: null,
         closing: `
@@ -375,7 +376,7 @@ describe('mrWidgetOptions', () => {
       expect(vm.$el.querySelector('.close-related-link')).toBeDefined();
     });
 
-    it('does not render if state is nothingToMerge', (done) => {
+    it('does not render if state is nothingToMerge', done => {
       vm.mr.state = stateKey.nothingToMerge;
       Vue.nextTick(() => {
         expect(vm.$el.querySelector('.close-related-link')).toBeNull();
@@ -385,7 +386,7 @@ describe('mrWidgetOptions', () => {
   });
 
   describe('rendering source branch removal status', () => {
-    it('renders when user cannot remove branch and branch should be removed', (done) => {
+    it('renders when user cannot remove branch and branch should be removed', done => {
       vm.mr.canRemoveSourceBranch = false;
       vm.mr.shouldRemoveSourceBranch = true;
       vm.mr.state = 'readyToMerge';
@@ -402,7 +403,7 @@ describe('mrWidgetOptions', () => {
       });
     });
 
-    it('does not render in merged state', (done) => {
+    it('does not render in merged state', done => {
       vm.mr.canRemoveSourceBranch = false;
       vm.mr.shouldRemoveSourceBranch = true;
       vm.mr.state = 'merged';
@@ -430,13 +431,16 @@ describe('mrWidgetOptions', () => {
       deployed_at_formatted: 'Mar 22, 2017 10:44pm',
     };
 
-    beforeEach((done) => {
-      vm.mr.deployments.push({
-        ...deploymentMockData,
-      }, {
-        ...deploymentMockData,
-        id: deploymentMockData.id + 1,
-      });
+    beforeEach(done => {
+      vm.mr.deployments.push(
+        {
+          ...deploymentMockData,
+        },
+        {
+          ...deploymentMockData,
+          id: deploymentMockData.id + 1,
+        },
+      );
 
       vm.$nextTick(done);
     });