From d0ce09c50f15a2a722229ccf13fd4cafd42f8a31 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 14 Sep 2017 15:48:54 +0300 Subject: [PATCH] Revert "[SSE] Fix Bug 35842." This reverts commit 86213ed908b05f331f245059295959f071b99dca. --- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 3 +-- apps/spreadsheeteditor/main/app/view/Toolbar.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 138ce1064..eb0132201 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -2037,8 +2037,7 @@ define([ toolbar.lockToolbar(SSE.enumLock.multiselect, this._state.multiselect, { array: [toolbar.btnTableTemplate, toolbar.btnInsertHyperlink]}); need_disable = !!info.asc_getPivotTableInfo(); - toolbar.lockToolbar(SSE.enumLock.editPivot, need_disable, { array: [toolbar.btnMerge, toolbar.btnInsertHyperlink, toolbar.btnSetAutofilter, toolbar.btnClearAutofilter, - toolbar.btnSortDown, toolbar.btnSortUp, toolbar.btnAutofilter, toolbar.btnTableTemplate]}); + toolbar.lockToolbar(SSE.enumLock.editPivot, need_disable, { array: [toolbar.btnMerge, toolbar.btnInsertHyperlink, toolbar.btnSetAutofilter, toolbar.btnClearAutofilter, toolbar.btnSortDown, toolbar.btnSortUp, toolbar.btnAutofilter]}); } val = info.asc_getNumFormatInfo(); diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 3207f28fe..dda3a9cc8 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -713,7 +713,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, _set.multiselect, _set.editPivot], + 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('
') }