about summary refs log tree commit diff
path: root/app/javascript/packs
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-11-06 14:38:28 +0100
committerThibaut Girka <thib@sitedethib.com>2019-11-06 14:38:28 +0100
commit0ae7d8427394d5f98fb2bd78eaae9bf848831186 (patch)
treee15a6321eedcbf9a2ae55ce24e7d8960f233b5ef /app/javascript/packs
parent00793a86bc52e4cb37318e42ea4ceb37a896c727 (diff)
parent42d9ca21de298e1d51b87723745f2b17e4169894 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `package.json`
Diffstat (limited to 'app/javascript/packs')
-rw-r--r--app/javascript/packs/public.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 1229a7505..3eae1a457 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -1,6 +1,7 @@
 import loadPolyfills from '../mastodon/load_polyfills';
 import ready from '../mastodon/ready';
 import { start } from '../mastodon/common';
+import loadKeyboardExtensions from '../mastodon/load_keyboard_extensions';
 
 start();
 
@@ -122,6 +123,9 @@ function main() {
   });
 }
 
-loadPolyfills().then(main).catch(error => {
-  console.error(error);
-});
+loadPolyfills()
+  .then(main)
+  .then(loadKeyboardExtensions)
+  .catch(error => {
+    console.error(error);
+  });