From 96edb7da38e32c3e7eabb87556f30e095e52c369 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 27 Aug 2020 16:16:58 -0400
Subject: [PATCH] REFACTOR: Move Mousetrap library to an import

---
 app/assets/javascripts/discourse-shims.js                     | 4 ++++
 app/assets/javascripts/discourse/app/app.js                   | 2 +-
 app/assets/javascripts/discourse/app/components/d-editor.js   | 3 ++-
 .../discourse/app/initializers/keyboard-shortcuts.js          | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse-shims.js b/app/assets/javascripts/discourse-shims.js
index df7de1166a4..8e664228f3d 100644
--- a/app/assets/javascripts/discourse-shims.js
+++ b/app/assets/javascripts/discourse-shims.js
@@ -25,6 +25,10 @@ define("bootbox", ["exports"], function(__exports__) {
   __exports__.default = window.bootbox;
 });
 
+define("mousetrap", ["exports"], function(__exports__) {
+  __exports__.default = window.Mousetrap;
+});
+
 define("@popperjs/core", ["exports"], function(__exports__) {
   __exports__.default = window.Popper;
   __exports__.createPopper = window.Popper.createPopper;
diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
index 458f63ac9cd..80d288fe984 100644
--- a/app/assets/javascripts/discourse/app/app.js
+++ b/app/assets/javascripts/discourse/app/app.js
@@ -1,6 +1,6 @@
-/*global Mousetrap:true*/
 import Application from "@ember/application";
 import { buildResolver } from "discourse-common/resolver";
+import Mousetrap from "mousetrap";
 
 const _pluginCallbacks = [];
 
diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js
index 735d4fe5457..e2cf8746db4 100644
--- a/app/assets/javascripts/discourse/app/components/d-editor.js
+++ b/app/assets/javascripts/discourse/app/components/d-editor.js
@@ -2,7 +2,8 @@ import I18n from "I18n";
 import { debounce, later, next, schedule, scheduleOnce } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import Component from "@ember/component";
-/*global Mousetrap:true */
+import Mousetrap from "mousetrap";
+
 import discourseComputed, {
   on,
   observes
diff --git a/app/assets/javascripts/discourse/app/initializers/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/initializers/keyboard-shortcuts.js
index 90860193f90..7612ed623a0 100644
--- a/app/assets/javascripts/discourse/app/initializers/keyboard-shortcuts.js
+++ b/app/assets/javascripts/discourse/app/initializers/keyboard-shortcuts.js
@@ -1,5 +1,5 @@
-/*global Mousetrap:true*/
 import KeyboardShortcuts from "discourse/lib/keyboard-shortcuts";
+import Mousetrap from "mousetrap";
 
 export default {
   name: "keyboard-shortcuts",