Merge branch 'master' into 'es-module-autosave'es-module-autosave

# Conflicts:
#   app/assets/javascripts/issuable_form.js
#   app/assets/javascripts/notes.js

1 files changed, 21 insertions, 30 deletions

diff --git a/app/assets/javascripts/shortcuts_navigation.js b/app/assets/javascripts/shortcuts_navigation.js
index 55bae0c08a1..b4562701a3e 100644
--- a/app/assets/javascripts/shortcuts_navigation.js
+++ b/app/assets/javascripts/shortcuts_navigation.js
@@ -1,36 +1,27 @@
-/* eslint-disable func-names, space-before-function-paren, max-len, no-var, one-var, no-restricted-syntax, vars-on-top, no-use-before-define, no-param-reassign, new-cap, no-underscore-dangle, wrap-iife, prefer-arrow-callback, consistent-return, no-return-assign */
 /* global Mousetrap */
-/* global Shortcuts */
 
 import findAndFollowLink from './shortcuts_dashboard_navigation';
-import './shortcuts';
+import Shortcuts from './shortcuts';
 
-(function() {
-  var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
+export default class ShortcutsNavigation extends Shortcuts {
+  constructor() {
+    super();
 
-  this.ShortcutsNavigation = (function(superClass) {
-    extend(ShortcutsNavigation, superClass);
+    Mousetrap.bind('g p', () => findAndFollowLink('.shortcuts-project'));
+    Mousetrap.bind('g e', () => findAndFollowLink('.shortcuts-project-activity'));
+    Mousetrap.bind('g f', () => findAndFollowLink('.shortcuts-tree'));
+    Mousetrap.bind('g c', () => findAndFollowLink('.shortcuts-commits'));
+    Mousetrap.bind('g j', () => findAndFollowLink('.shortcuts-builds'));
+    Mousetrap.bind('g n', () => findAndFollowLink('.shortcuts-network'));
+    Mousetrap.bind('g d', () => findAndFollowLink('.shortcuts-repository-charts'));
+    Mousetrap.bind('g i', () => findAndFollowLink('.shortcuts-issues'));
+    Mousetrap.bind('g b', () => findAndFollowLink('.shortcuts-issue-boards'));
+    Mousetrap.bind('g m', () => findAndFollowLink('.shortcuts-merge_requests'));
+    Mousetrap.bind('g t', () => findAndFollowLink('.shortcuts-todos'));
+    Mousetrap.bind('g w', () => findAndFollowLink('.shortcuts-wiki'));
+    Mousetrap.bind('g s', () => findAndFollowLink('.shortcuts-snippets'));
+    Mousetrap.bind('i', () => findAndFollowLink('.shortcuts-new-issue'));
 
-    function ShortcutsNavigation() {
-      ShortcutsNavigation.__super__.constructor.call(this);
-      Mousetrap.bind('g p', () => findAndFollowLink('.shortcuts-project'));
-      Mousetrap.bind('g e', () => findAndFollowLink('.shortcuts-project-activity'));
-      Mousetrap.bind('g f', () => findAndFollowLink('.shortcuts-tree'));
-      Mousetrap.bind('g c', () => findAndFollowLink('.shortcuts-commits'));
-      Mousetrap.bind('g j', () => findAndFollowLink('.shortcuts-builds'));
-      Mousetrap.bind('g n', () => findAndFollowLink('.shortcuts-network'));
-      Mousetrap.bind('g d', () => findAndFollowLink('.shortcuts-repository-charts'));
-      Mousetrap.bind('g i', () => findAndFollowLink('.shortcuts-issues'));
-      Mousetrap.bind('g b', () => findAndFollowLink('.shortcuts-issue-boards'));
-      Mousetrap.bind('g m', () => findAndFollowLink('.shortcuts-merge_requests'));
-      Mousetrap.bind('g t', () => findAndFollowLink('.shortcuts-todos'));
-      Mousetrap.bind('g w', () => findAndFollowLink('.shortcuts-wiki'));
-      Mousetrap.bind('g s', () => findAndFollowLink('.shortcuts-snippets'));
-      Mousetrap.bind('i', () => findAndFollowLink('.shortcuts-new-issue'));
-      this.enabledHelp.push('.hidden-shortcut.project');
-    }
-
-    return ShortcutsNavigation;
-  })(Shortcuts);
-}).call(window);
+    this.enabledHelp.push('.hidden-shortcut.project');
+  }
+}