Skip to content

Commit

Permalink
[4.2] hotkeys (#38334)
Browse files Browse the repository at this point in the history
* [4.2] hotkeys

In the past there were some issues with folders with a . in them. I forget what the issue was. As a result choices.js was stored in choicesjs to avoid this.

This pr does the same for hotkeys.js

* .
  • Loading branch information
brianteeman committed Aug 15, 2022
1 parent c375611 commit ab6d2f8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions build/build-modules-js/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -387,15 +387,15 @@
"licenseFilename": "LICENSE.txt"
},
"hotkeys-js": {
"name": "hotkeys.js",
"name": "hotkeysjs",
"licenseFilename": "LICENSE",
"js" : {
"dist/hotkeys.js": "js/hotkeys.js",
"dist/hotkeys.min.js": "js/hotkeys.min.js"
},
"provideAssets": [
{
"name": "hotkeys.js",
"name": "hotkeysjs",
"type": "script",
"uri": "hotkeys.min.js",
"attributes": {
Expand Down
2 changes: 1 addition & 1 deletion plugins/system/shortcut/src/Extension/Shortcut.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public function initialize()
$document = $this->getApplication()->getDocument();
$wa = $document->getWebAssetManager();
$wa->useScript('bootstrap.modal');
$wa->registerAndUseScript('script', 'plg_system_shortcut/shortcut.min.js', ['dependencies' => ['hotkeys.js']]);
$wa->registerAndUseScript('script', 'plg_system_shortcut/shortcut.min.js', ['dependencies' => ['hotkeysjs']]);

$timeout = $this->params->get('timeout', 2000);

Expand Down

0 comments on commit ab6d2f8

Please sign in to comment.