pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-04-07 14:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

[common] Fix in shortcuts dialog

Browse Source
This commit is contained in:
Alexey Koshelev
2025-09-10 14:18:12 +03:00
parent 9af7b86a51
commit b01ca8e925
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/common/main/lib/controller/Shortcuts.js
View File

@ -278,7 +278,12 @@ define([
return !shortcut.ascShortcut.asc_IsHidden();
});
const hintText = item.label + (firstShortcut ? ' (' + firstShortcut.keys.join('+') + ')' : '');
item.btn.updateHint(hintText);
if(item.applyCallback) {
item.applyCallback(item, hintText);
} else {
item.btn.updateHint(hintText);
}
}
}
},

3
apps/common/main/lib/view/ShortcutEditDialog.js
View File

@ -247,7 +247,8 @@ define([
if (e.metaKey) keys.push('⌘');
if (!['Control', 'Shift', 'Alt', 'Meta'].includes(e.key)) {
keys.push(DE.getController('Common.Controllers.Shortcuts').keyCodeToKeyName(e.keyCode));
const app = (window.DE || window.PE || window.SSE || window.PDFE || window.VE);
keys.push(app.getController('Common.Controllers.Shortcuts').keyCodeToKeyName(e.keyCode));
ascShortcut.asc_SetKeyCode(e.keyCode);
} else {
ascShortcut.asc_SetKeyCode(null);

2
apps/common/main/lib/view/ShortcutsDialog.js
View File

@ -102,7 +102,7 @@ define([
'<% }); %>',
'</div>',
'<% if (action.isLocked) { %>',
'<i class="icon toolbar__icon btn-favorite icon-lock">&nbsp;</i>',
'<i class="icon toolbar__icon btn-lock icon-lock">&nbsp;</i>',
'<% } else { %>',
'<button type="button" class="action-edit btn-toolbar">',
'<i class="icon toolbar__icon btn-edit">&nbsp;</i>',

1
apps/common/main/resources/less/shortcuts-dialog.less
View File

@ -34,6 +34,7 @@
.action-keys {
display: flex;
flex-wrap: wrap;
flex: 1;
.margin-right(4px);
.action-keys-item {