Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2081 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2022-11-23 13:08:08 +03:00 committed by GitHub
parent 98a10b7f5d 6d7b96399b
commit 7c2be61278
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/common/main/lib/core/keymaster.js
View file

@ -30,7 +30,8 @@
'`': 192, '-': 189, '=': 187, '`': 192, '-': 189, '=': 187,
';': 186, '\'': 222, ';': 186, '\'': 222,
'[': 219, ']': 221, '\\': 220, '[': 219, ']': 221, '\\': 220,
'ff-': 173, 'ff=': 61 'ff-': 173, 'ff=': 61,
numplus: 107, numminus: 109
}, },
code = function(x){ code = function(x){
return _MAP[x] || x.toUpperCase().charCodeAt(0); return _MAP[x] || x.toUpperCase().charCodeAt(0);

BIN
apps/common/main/resources/img/controls/flags.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
apps/common/main/resources/img/controls/flags@1.5x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
apps/common/main/resources/img/controls/flags@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 24 KiB

4
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -2053,7 +2053,7 @@ define([
return false; return false;
} }
}; };
shortcuts['command+shift+=,ctrl+shift+=' + (Common.Utils.isGecko ? ',command+shift+ff=,ctrl+shift+ff=' : '')] = function(e) { shortcuts['command+shift+=,ctrl+shift+=,command+shift+numplus,ctrl+shift+numplus' + (Common.Utils.isGecko ? ',command+shift+ff=,ctrl+shift+ff=' : '')] = function(e) {
if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.toolbar.mode.isEditOle && !me.toolbar.btnAddCell.isDisabled()) { if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.toolbar.mode.isEditOle && !me.toolbar.btnAddCell.isDisabled()) {
var cellinfo = me.api.asc_getCellInfo(), var cellinfo = me.api.asc_getCellInfo(),
selectionType = cellinfo.asc_getSelectionType(); selectionType = cellinfo.asc_getSelectionType();
@ -2084,7 +2084,7 @@ define([
return false; return false;
}; };
shortcuts['command+shift+-,ctrl+shift+-' + (Common.Utils.isGecko ? ',command+shift+ff-,ctrl+shift+ff-' : '')] = function(e) { shortcuts['command+shift+-,ctrl+shift+-,command+shift+numminus,ctrl+shift+numminus' + (Common.Utils.isGecko ? ',command+shift+ff-,ctrl+shift+ff-' : '')] = function(e) {
if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.toolbar.mode.isEditOle && !me.toolbar.btnDeleteCell.isDisabled()) { if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.toolbar.mode.isEditOle && !me.toolbar.btnDeleteCell.isDisabled()) {
var cellinfo = me.api.asc_getCellInfo(), var cellinfo = me.api.asc_getCellInfo(),
selectionType = cellinfo.asc_getSelectionType(); selectionType = cellinfo.asc_getSelectionType();