From c87c80bfcbbad5f09295af5688f65bff6632e2bb Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 1 Nov 2016 15:42:46 +0300 Subject: [PATCH] [SSE] Fix Bug 33304, fix Bug 33300. --- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 10 +++++++--- apps/spreadsheeteditor/main/app/view/Toolbar.js | 7 ++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index de00631bc..afc3076ce 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -99,7 +99,8 @@ define([ tablestylename: undefined, tablename: undefined, namedrange_locked: false, - fontsize: undefined + fontsize: undefined, + multiselect: false }; var checkInsertAutoshape = function(e, action) { @@ -1172,7 +1173,7 @@ define([ Common.util.Shortcuts.delegateShortcuts({ shortcuts: { 'command+l,ctrl+l': function(e) { - if (me.editMode) { + if (me.editMode && !me._state.multiselect) { if (!me.api.asc_getCellInfo().asc_getFormatTableInfo()) me._setTableFormat(me.toolbar.mnuTableTemplatePicker.store.at(23).get('name')); } @@ -1197,7 +1198,7 @@ define([ e.stopPropagation(); }, 'command+k,ctrl+k': function (e) { - if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.api.isCellEdited) + if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.api.isCellEdited && !me._state.multiselect) me.onHyperlink(); e.preventDefault(); } @@ -1808,6 +1809,9 @@ define([ need_disable = this._state.controlsdisabled.filters || !filterInfo || (filterInfo.asc_getIsApplyAutoFilter()!==true); toolbar.lockToolbar(SSE.enumLock.ruleDelFilter, need_disable, {array:[toolbar.btnClearAutofilter,toolbar.mnuitemClearFilter]}); + + this._state.multiselect = info.asc_getFlags().asc_getMultiselect(); + toolbar.lockToolbar(SSE.enumLock.multiselect, this._state.multiselect, { array: [toolbar.btnTableTemplate, toolbar.btnInsertHyperlink]}); } fontparam = toolbar.numFormatTypes[info.asc_getNumFormatType()]; diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 0279c464b..d1960fd3e 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -75,7 +75,8 @@ define([ ruleFilter: 'rule-filter', ruleDelFilter: 'rule-clear-filter', menuFileOpen: 'menu-file-open', - cantPrint: 'cant-print' + cantPrint: 'cant-print', + multiselect: 'is-multiselect' }; SSE.Views.Toolbar = Backbone.View.extend(_.extend({ @@ -495,7 +496,7 @@ define([ id : 'id-toolbar-btn-inserthyperlink', cls : 'btn-toolbar', iconCls : 'btn-inserthyperlink', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selShape, _set.lostConnect, _set.coAuth] + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selShape, _set.multiselect, _set.lostConnect, _set.coAuth] }); me.btnInsertChart = new Common.UI.Button({ @@ -596,7 +597,7 @@ define([ id : 'id-toolbar-btn-ttempl', cls : 'btn-toolbar', iconCls : 'btn-ttempl', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter], + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.multiselect], menu : new Common.UI.Menu({ items: [ { template: _.template('
') }