Merge pull request #307 from themoeway/modernize

Modernize codebase

3 files changed, 9 insertions, 9 deletions

diff --git a/ext/js/input/hotkey-handler.js b/ext/js/input/hotkey-handler.js
index 26a80b77..f05351bb 100644
--- a/ext/js/input/hotkey-handler.js
+++ b/ext/js/input/hotkey-handler.js
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/* global
- * DocumentUtil
- */
+import {EventDispatcher, EventListenerCollection} from '../core.js';
+import {DocumentUtil} from '../dom/document-util.js';
+import {yomichan} from '../yomichan.js';
 
 /**
  * Class which handles hotkey events and actions.
  */
-class HotkeyHandler extends EventDispatcher {
+export class HotkeyHandler extends EventDispatcher {
     /**
      * Information describing a hotkey.
      * @typedef {object} HotkeyDefinition
diff --git a/ext/js/input/hotkey-help-controller.js b/ext/js/input/hotkey-help-controller.js
index e5ea75df..67df9f84 100644
--- a/ext/js/input/hotkey-help-controller.js
+++ b/ext/js/input/hotkey-help-controller.js
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/* global
- * HotkeyUtil
- */
+import {isObject} from '../core.js';
+import {yomichan} from '../yomichan.js';
+import {HotkeyUtil} from './hotkey-util.js';
 
-class HotkeyHelpController {
+export class HotkeyHelpController {
     constructor() {
         this._hotkeyUtil = new HotkeyUtil();
         this._localActionHotseys = new Map();
diff --git a/ext/js/input/hotkey-util.js b/ext/js/input/hotkey-util.js
index eacbc553..e23849e0 100644
--- a/ext/js/input/hotkey-util.js
+++ b/ext/js/input/hotkey-util.js
@@ -19,7 +19,7 @@
 /**
  * Utility class to help display hotkeys and convert to/from commands.
  */
-class HotkeyUtil {
+export class HotkeyUtil {
     /**
      * Creates a new instance.
      * @param {?string} os The operating system for this instance.