From c1fcad76d02f2bc0ff98e79fe649d1ac18a34f1b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 7 Nov 2016 16:00:11 +0300 Subject: [PATCH] [SSE] Bug 26981. --- .../main/app/controller/Toolbar.js | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 34d9c5b52..c403c8a9b 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -1557,13 +1557,10 @@ define([ onApiSelectionChanged: function(info) { if (!this.editMode) return; - var selectionType = info.asc_getFlags().asc_getSelectionType(); - var coauth_disable = (!this.toolbar.mode.isEditMailMerge && !this.toolbar.mode.isEditDiagram) ? (info.asc_getLocked()===true) : false; - if (this._disableEditOptions(selectionType, coauth_disable)) { - return; - } - - var me = this, + var selectionType = info.asc_getFlags().asc_getSelectionType(), + coauth_disable = (!this.toolbar.mode.isEditMailMerge && !this.toolbar.mode.isEditDiagram) ? (info.asc_getLocked()===true) : false, + editOptionsDisabled = this._disableEditOptions(selectionType, coauth_disable), + me = this, toolbar = this.toolbar, fontobj = info.asc_getFont(), val, need_disable = false; @@ -1574,6 +1571,15 @@ define([ Common.NotificationCenter.trigger('fonts:change', fontobj); } + /* read font size */ + var str_size = fontobj.asc_getSize(); + if (this._state.fontsize !== str_size) { + toolbar.cmbFontSize.setValue((str_size!==undefined) ? str_size : ''); + this._state.fontsize = str_size; + } + + if (editOptionsDisabled) return; + /* read font params */ if (!toolbar.mode.isEditMailMerge && !toolbar.mode.isEditDiagram) { val = fontobj.asc_getBold(); @@ -1593,13 +1599,6 @@ define([ } } - /* read font size */ - var str_size = fontobj.asc_getSize(); - if (this._state.fontsize !== str_size) { - toolbar.cmbFontSize.setValue((str_size!==undefined) ? str_size : ''); - this._state.fontsize = str_size; - } - /* read font color */ var clr, color,