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

[SSE] Fix Bug 46126

Browse source
This commit is contained in:
Julia Radzhabova 2020-08-14 16:58:41 +03:00
parent 8f3b794480
commit 6fc5bc7cfe
2 changed files with 10 additions and 10 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

@ -29,7 +29,8 @@
',': 188, '.': 190, '/': 191, ',': 188, '.': 190, '/': 191,
'`': 192, '-': 189, '=': 187, '`': 192, '-': 189, '=': 187,
';': 186, '\'': 222, ';': 186, '\'': 222,
'[': 219, ']': 221, '\\': 220 '[': 219, ']': 221, '\\': 220,
'ff-': 173, 'ff=': 61
}, },
code = function(x){ code = function(x){
return _MAP[x] || x.toUpperCase().charCodeAt(0); return _MAP[x] || x.toUpperCase().charCodeAt(0);

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

@ -1498,8 +1498,7 @@ define([
this.api.asc_registerCallback('asc_onStopFormatPainter', _.bind(this.onApiStyleChange, this)); this.api.asc_registerCallback('asc_onStopFormatPainter', _.bind(this.onApiStyleChange, this));
this.api.asc_registerCallback('asc_onSelectionChanged', _.bind(this.onApiSelectionChanged, this)); this.api.asc_registerCallback('asc_onSelectionChanged', _.bind(this.onApiSelectionChanged, this));
Common.util.Shortcuts.delegateShortcuts({ var shortcuts = {
shortcuts: {
'command+l,ctrl+l': function(e) { 'command+l,ctrl+l': function(e) {
if ( me.editMode && !me._state.multiselect && me.appConfig.canModifyFilter) { if ( me.editMode && !me._state.multiselect && me.appConfig.canModifyFilter) {
var cellinfo = me.api.asc_getCellInfo(), var cellinfo = me.api.asc_getCellInfo(),
@ -1557,8 +1556,9 @@ define([
} }
return false; return false;
}, }
'command+shift+=,ctrl+shift+=': function(e) { };
shortcuts['command+shift+=,ctrl+shift+=' + (Common.Utils.isGecko ? ',ctrl+shift+ff=' : '')] = function(e) {
if (me.editMode && !me.toolbar.btnAddCell.isDisabled()) { if (me.editMode && !me.toolbar.btnAddCell.isDisabled()) {
var cellinfo = me.api.asc_getCellInfo(), var cellinfo = me.api.asc_getCellInfo(),
selectionType = cellinfo.asc_getSelectionType(); selectionType = cellinfo.asc_getSelectionType();
@ -1584,8 +1584,8 @@ define([
} }
return false; return false;
}, };
'command+shift+-,ctrl+shift+-': function(e) { shortcuts['command+shift+-,ctrl+shift+-' + (Common.Utils.isGecko ? ',ctrl+shift+ff-' : '')] = function(e) {
if (me.editMode && !me.toolbar.btnDeleteCell.isDisabled()) { if (me.editMode && !me.toolbar.btnDeleteCell.isDisabled()) {
var cellinfo = me.api.asc_getCellInfo(), var cellinfo = me.api.asc_getCellInfo(),
selectionType = cellinfo.asc_getSelectionType(); selectionType = cellinfo.asc_getSelectionType();
@ -1611,9 +1611,8 @@ define([
} }
return false; return false;
} };
} Common.util.Shortcuts.delegateShortcuts({shortcuts: shortcuts});
});
this.onApiSelectionChanged(this.api.asc_getCellInfo()); this.onApiSelectionChanged(this.api.asc_getCellInfo());
this.attachToControlEvents(); this.attachToControlEvents();