pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-02-10 18:05:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

For previous commit

Browse Source
This commit is contained in:
Alexey Koshelev
2025-11-12 20:37:28 +03:00
parent bdf693a715
commit ffed19e4fb
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -594,6 +594,10 @@ define([
// weight = range for main key + “cost” of extra keys
return keyIndex * 100 + extras;
}
if (first.ascShortcut.asc_IsLocked() && !second.ascShortcut.asc_IsLocked()) return -1;
if (!first.ascShortcut.asc_IsLocked() && second.ascShortcut.asc_IsLocked()) return 1;
let wFirst = getWeight(first.ascShortcut);
let wSecond = getWeight(second.ascShortcut);

25
apps/common/main/lib/view/ShortcutsEditDialog.js
View File

@ -97,21 +97,19 @@ define([
getFocusedComponents: function() {
const dynamicComponents = [];
this.shortcutsCollection.each(function(record) {
dynamicComponents.push(record.get('keysInput'), record.get('removeBtn'));
if(record.get('removeBtn')) {
dynamicComponents.push(record.get('keysInput'), record.get('removeBtn'));
}
});
return dynamicComponents.concat(this.getFooterButtons());
},
getDefaultFocusableComponent: function() {
return this.getFirstFocusableComponent();
},
getFirstFocusableComponent: function(right) {
const focusableItems = this.shortcutsCollection.filter(function(item) {
const firstFocusableItem = this.shortcutsCollection.find(function(item) {
return item.get('removeBtn');
});
if(focusableItems.length > 0) {
return focusableItems[right ? focusableItems.length - 1 : 0].get('keysInput');
if(firstFocusableItem) {
return firstFocusableItem.get('keysInput');
} else {
return this.getFooterButtons()[0];
}
@ -379,11 +377,20 @@ define([
});
$item.find('.remove-btn').on('click', function() {
const removedIndex = me.shortcutsCollection.findIndex(function(record) {
return record == item;
});
me.shortcutsCollection.remove(item);
if(me.shortcutsCollection.length == 0) {
me.onAddShortcut();
}
me.getFirstFocusableComponent(true).focus();
let newFocusableIndex = removedIndex < me.shortcutsCollection.length ? removedIndex : removedIndex - 1;
if(me.shortcutsCollection.at(newFocusableIndex).get('removeBtn')) {
me.shortcutsCollection.at(newFocusableIndex).get('removeBtn').focus();
} else {
me.getFooterButtons()[0].focus();;
}
});
});
this.fixHeight(true);