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

[SSE] Bug 26981.

Browse source
This commit is contained in:
Julia Radzhabova 2016-11-07 16:00:11 +03:00
parent 08e61d9cd8
commit c1fcad76d0
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1557,13 +1557,10 @@ define([
onApiSelectionChanged: function(info) { onApiSelectionChanged: function(info) {
if (!this.editMode) return; if (!this.editMode) return;
var selectionType = info.asc_getFlags().asc_getSelectionType(); var selectionType = info.asc_getFlags().asc_getSelectionType(),
var coauth_disable = (!this.toolbar.mode.isEditMailMerge && !this.toolbar.mode.isEditDiagram) ? (info.asc_getLocked()===true) : false; coauth_disable = (!this.toolbar.mode.isEditMailMerge && !this.toolbar.mode.isEditDiagram) ? (info.asc_getLocked()===true) : false,
if (this._disableEditOptions(selectionType, coauth_disable)) { editOptionsDisabled = this._disableEditOptions(selectionType, coauth_disable),
return; me = this,
}
var me = this,
toolbar = this.toolbar, toolbar = this.toolbar,
fontobj = info.asc_getFont(), fontobj = info.asc_getFont(),
val, need_disable = false; val, need_disable = false;
@ -1574,6 +1571,15 @@ define([
Common.NotificationCenter.trigger('fonts:change', fontobj); 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 */ /* read font params */
if (!toolbar.mode.isEditMailMerge && !toolbar.mode.isEditDiagram) { if (!toolbar.mode.isEditMailMerge && !toolbar.mode.isEditDiagram) {
val = fontobj.asc_getBold(); 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 */ /* read font color */
var clr, var clr,
color, color,