diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index d85c65184..9cc423981 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1572,7 +1572,8 @@ define([ isTableLocked = cellinfo.asc_getLockedTable()===true, isObjLocked = false, commentsController = this.getApplication().getController('Common.Controllers.Comments'), - internaleditor = this.permissions.isEditMailMerge || this.permissions.isEditDiagram; + internaleditor = this.permissions.isEditMailMerge || this.permissions.isEditDiagram, + xfs = cellinfo.asc_getXfs(); switch (seltype) { case Asc.c_oAscSelectionType.RangeCells: iscellmenu = true; break; @@ -1742,8 +1743,8 @@ define([ isintable = (formatTableInfo !== null), ismultiselect = cellinfo.asc_getMultiselect(); documentHolder.ssMenu.formatTableName = (isintable) ? formatTableInfo.asc_getTableName() : null; - documentHolder.ssMenu.cellColor = cellinfo.asc_getFillColor(); - documentHolder.ssMenu.fontColor = cellinfo.asc_getXfs().asc_getFontColor(); + documentHolder.ssMenu.cellColor = xfs.asc_getFillColor(); + documentHolder.ssMenu.fontColor = xfs.asc_getFontColor(); documentHolder.pmiInsertEntire.setVisible(isrowmenu||iscolmenu); documentHolder.pmiInsertEntire.setCaption((isrowmenu) ? this.textInsertTop : this.textInsertLeft); @@ -1819,8 +1820,8 @@ define([ documentHolder.pmiEntriesList.setVisible(!iscelledit && !inPivot); documentHolder.pmiNumFormat.setVisible(!iscelledit); - documentHolder.pmiAdvancedNumFormat.options.numformatinfo = documentHolder.pmiNumFormat.menu.options.numformatinfo = cellinfo.asc_getNumFormatInfo(); - documentHolder.pmiAdvancedNumFormat.options.numformat = cellinfo.asc_getNumFormat(); + documentHolder.pmiAdvancedNumFormat.options.numformatinfo = documentHolder.pmiNumFormat.menu.options.numformatinfo = xfs.asc_getNumFormatInfo(); + documentHolder.pmiAdvancedNumFormat.options.numformat = xfs.asc_getNumFormat(); _.each(documentHolder.ssMenu.items, function(item) { item.setDisabled(isCellLocked); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 9d5c94bbd..b9dc6e1dc 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -2075,17 +2075,17 @@ define([ editOptionsDisabled = this._disableEditOptions(selectionType, coauth_disable), me = this, toolbar = this.toolbar, - fontobj = info.asc_getXfs(), + xfs = info.asc_getXfs(), val, need_disable = false; /* read font name */ - var fontparam = fontobj.asc_getFontName(); + var fontparam = xfs.asc_getFontName(); if (fontparam != toolbar.cmbFontName.getValue()) { - Common.NotificationCenter.trigger('fonts:change', fontobj); + Common.NotificationCenter.trigger('fonts:change', xfs); } /* read font size */ - var str_size = fontobj.asc_getFontSize(); + var str_size = xfs.asc_getFontSize(); if (this._state.fontsize !== str_size) { toolbar.cmbFontSize.setValue((str_size !== undefined) ? str_size : ''); this._state.fontsize = str_size; @@ -2124,29 +2124,29 @@ define([ /* read font params */ if (!toolbar.mode.isEditMailMerge && !toolbar.mode.isEditDiagram) { - val = fontobj.asc_getFontBold(); + val = xfs.asc_getFontBold(); if (this._state.bold !== val) { toolbar.btnBold.toggle(val === true, true); this._state.bold = val; } - val = fontobj.asc_getFontItalic(); + val = xfs.asc_getFontItalic(); if (this._state.italic !== val) { toolbar.btnItalic.toggle(val === true, true); this._state.italic = val; } - val = fontobj.asc_getFontUnderline(); + val = xfs.asc_getFontUnderline(); if (this._state.underline !== val) { toolbar.btnUnderline.toggle(val === true, true); this._state.underline = val; } - val = fontobj.asc_getFontStrikeout(); + val = xfs.asc_getFontStrikeout(); if (this._state.strikeout !== val) { toolbar.btnStrikeout.toggle(val === true, true); this._state.strikeout = val; } - var subsc = fontobj.asc_getFontSubscript(), - supersc = fontobj.asc_getFontSuperscript(); + var subsc = xfs.asc_getFontSubscript(), + supersc = xfs.asc_getFontSuperscript(); if (this._state.subscript !== subsc || this._state.superscript !== supersc) { var index = (supersc) ? 0 : (subsc ? 1 : -1), @@ -2176,7 +2176,7 @@ define([ paragraphColorPicker = this.toolbar.mnuBackColorPicker; if (!toolbar.btnTextColor.ischanged && !fontColorPicker.isDummy) { - color = fontobj.asc_getFontColor(); + color = xfs.asc_getFontColor(); if (color) { if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { clr = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }; @@ -2210,7 +2210,7 @@ define([ /* read cell background color */ if (!toolbar.btnBackColor.ischanged && !paragraphColorPicker.isDummy) { - color = info.asc_getFillColor(); + color = xfs.asc_getFillColor(); if (color) { if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { clr = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() }; @@ -2261,7 +2261,7 @@ define([ formatTableInfo = info.asc_getFormatTableInfo(); if (!toolbar.mode.isEditMailMerge) { /* read cell horizontal align */ - fontparam = info.asc_getHorAlign(); + fontparam = xfs.asc_getHorAlign(); if (this._state.pralign !== fontparam) { this._state.pralign = fontparam; @@ -2291,7 +2291,7 @@ define([ toolbar.btnTextOrient.menu.items[2].setDisabled(need_disable); /* read cell vertical align */ - fontparam = info.asc_getVertAlign(); + fontparam = xfs.asc_getVertAlign(); if (this._state.valign !== fontparam) { this._state.valign = fontparam; @@ -2320,7 +2320,7 @@ define([ /* read cell text wrapping */ if (!toolbar.btnWrap.isDisabled()) { - val = info.asc_getWrapText(); + val = xfs.asc_getWrapText(); if (this._state.wrap !== val) { toolbar.btnWrap.toggle(val===true, true); this._state.wrap = val; @@ -2374,9 +2374,9 @@ define([ } - val = info.asc_getNumFormatInfo(); + val = xfs.asc_getNumFormatInfo(); if (val) { - this._state.numformat = info.asc_getNumFormat(); + this._state.numformat = xfs.asc_getNumFormat(); this._state.numformatinfo = val; val = val.asc_getType(); if (this._state.numformattype !== val) { @@ -2385,7 +2385,7 @@ define([ } } - val = info.asc_getAngle(); + val = xfs.asc_getAngle(); if (this._state.angle !== val) { toolbar.btnTextOrient.menu.clearAll(); switch(val) { @@ -2499,6 +2499,7 @@ define([ }; var selectionType = info.asc_getSelectionType(), + xfs = info.asc_getXfs(), coauth_disable = false; if ( _disableEditOptions(selectionType, coauth_disable) ) return; @@ -2506,9 +2507,9 @@ define([ if (selectionType == Asc.c_oAscSelectionType.RangeChart || selectionType == Asc.c_oAscSelectionType.RangeChartText) return; - var val = info.asc_getNumFormatInfo(); + var val = xfs.asc_getNumFormatInfo(); if ( val ) { - this._state.numformat = info.asc_getNumFormat(); + this._state.numformat = xfs.asc_getNumFormat(); this._state.numformatinfo = val; val = val.asc_getType(); if (this._state.numformattype !== val) { diff --git a/apps/spreadsheeteditor/main/app/view/CellSettings.js b/apps/spreadsheeteditor/main/app/view/CellSettings.js index 319b215b0..6547799e7 100644 --- a/apps/spreadsheeteditor/main/app/view/CellSettings.js +++ b/apps/spreadsheeteditor/main/app/view/CellSettings.js @@ -446,12 +446,13 @@ define([ if (props ) { this._noApply = true; - var value = props.asc_getAngle(); + var xfs = props.asc_getXfs(), + value = xfs.asc_getAngle(); if (Math.abs(this._state.CellAngle - value) > 0.1 || (this._state.CellAngle === undefined) && (this._state.CellAngle !== value)) { this.spnAngle.setValue((value !== null) ? value : '', true); this._state.CellAngle = value; } - this.fill = props.asc_getFill(); + this.fill = xfs.asc_getFill(); if (this.fill) { this.pattern = this.fill.asc_getPatternFill(); this.gradient = this.fill.asc_getGradientFill(); diff --git a/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js index d2690e3ad..08e8a05d0 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js @@ -311,7 +311,8 @@ define([ var iscellmenu, isrowmenu, iscolmenu, isallmenu, ischartmenu, isimagemenu, istextshapemenu, isshapemenu, istextchartmenu; var iscelllocked = cellinfo.asc_getLocked(), - seltype = cellinfo.asc_getSelectionType(); + seltype = cellinfo.asc_getSelectionType(), + xfs = cellinfo.asc_getXfs(); switch (seltype) { case Asc.c_oAscSelectionType.RangeCells: iscellmenu = true; break; @@ -420,7 +421,7 @@ define([ }); arrItems.push( - cellinfo.asc_getWrapText() ? + xfs.asc_getWrapText() ? { caption: me.menuUnwrap, event: 'unwrap' diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js index a10cbc83c..335524bd0 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js @@ -215,11 +215,12 @@ define([ var me = this, $pageTextFormat = $('.page[data-page=edit-text-format]'), - hAlign = me._cellInfo.asc_getHorAlign(), - vAlign = me._cellInfo.asc_getVertAlign(), + xfs = me._cellInfo.asc_getXfs(), + hAlign = xfs.asc_getHorAlign(), + vAlign = xfs.asc_getVertAlign(), hAlignStr = 'left', vAlignStr = 'bottom', - isWrapText = me._cellInfo.asc_getWrapText(); + isWrapText = xfs.asc_getWrapText(); if (vAlign == Asc.c_oAscVAlign.Top) vAlignStr = 'top'; @@ -319,14 +320,14 @@ define([ selectionType = cellInfo.asc_getSelectionType(), // coAuthDisable = (!this.toolbar.mode.isEditMailMerge && !this.toolbar.mode.isEditDiagram) ? (cellInfo.asc_getLocked()===true || cellInfo.asc_getLockedTable()===true) : false, // editOptionsDisabled = this._disableEditOptions(selectionType, coAuthDisable), - _fontInfo = cellInfo.asc_getXfs(), + xfs = cellInfo.asc_getXfs(), val, need_disable = false; - me.initFontSettings(_fontInfo); + me.initFontSettings(xfs); // Init fill color - var color = cellInfo.asc_getFillColor(), + var color = xfs.asc_getFillColor(), clr = me._sdkToThemeColor(color); $('#fill-color .color-preview').css('background-color', '#' + (_.isObject(clr) ? clr.color : clr)); diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js index 19f71f3aa..5c016a638 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js @@ -156,8 +156,8 @@ define([ // Align $('#edit-text-align-block').css('display', (_textIn == TextType.inShape) ? 'block' : 'none'); - var hAlign = _cellInfo.asc_getHorAlign(), - vAlign = _cellInfo.asc_getVertAlign(); + var hAlign = _fontInfo.asc_getHorAlign(), + vAlign = _fontInfo.asc_getVertAlign(); $('#font-left').toggleClass('active', hAlign===AscCommon.align_Left); $('#font-center').toggleClass('active', hAlign===AscCommon.align_Center);