diff --git a/apps/common/main/lib/core/keymaster.js b/apps/common/main/lib/core/keymaster.js index b7fafbf11..e89a8400a 100644 --- a/apps/common/main/lib/core/keymaster.js +++ b/apps/common/main/lib/core/keymaster.js @@ -29,7 +29,8 @@ ',': 188, '.': 190, '/': 191, '`': 192, '-': 189, '=': 187, ';': 186, '\'': 222, - '[': 219, ']': 221, '\\': 220 + '[': 219, ']': 221, '\\': 220, + 'ff-': 173, 'ff=': 61 }, code = function(x){ return _MAP[x] || x.toUpperCase().charCodeAt(0); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 159d6368c..c0f009271 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -1498,8 +1498,7 @@ define([ this.api.asc_registerCallback('asc_onStopFormatPainter', _.bind(this.onApiStyleChange, this)); this.api.asc_registerCallback('asc_onSelectionChanged', _.bind(this.onApiSelectionChanged, this)); - Common.util.Shortcuts.delegateShortcuts({ - shortcuts: { + var shortcuts = { 'command+l,ctrl+l': function(e) { if ( me.editMode && !me._state.multiselect && me.appConfig.canModifyFilter) { var cellinfo = me.api.asc_getCellInfo(), @@ -1557,8 +1556,9 @@ define([ } 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()) { var cellinfo = me.api.asc_getCellInfo(), selectionType = cellinfo.asc_getSelectionType(); @@ -1584,8 +1584,8 @@ define([ } 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()) { var cellinfo = me.api.asc_getCellInfo(), selectionType = cellinfo.asc_getSelectionType(); @@ -1611,9 +1611,8 @@ define([ } return false; - } - } - }); + }; + Common.util.Shortcuts.delegateShortcuts({shortcuts: shortcuts}); this.onApiSelectionChanged(this.api.asc_getCellInfo()); this.attachToControlEvents();