From cb1c4437f7006db93c69260dd2589e53d0e78b9b Mon Sep 17 00:00:00 2001 From: Alexander Trofimov Date: Fri, 8 May 2020 15:09:44 +0300 Subject: [PATCH] [SSE] Fix Use asc_getFillColor --- apps/spreadsheeteditor/main/app/controller/DocumentHolder.js | 2 +- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 2 +- apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 48bd32c27..bbb421438 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1741,7 +1741,7 @@ define([ isintable = (formatTableInfo !== null), ismultiselect = cellinfo.asc_getFlags().asc_getMultiselect(); documentHolder.ssMenu.formatTableName = (isintable) ? formatTableInfo.asc_getTableName() : null; - documentHolder.ssMenu.cellColor = cellinfo.asc_getFill().asc_getColor(); + documentHolder.ssMenu.cellColor = cellinfo.asc_getFillColor(); documentHolder.ssMenu.fontColor = cellinfo.asc_getFont().asc_getColor(); documentHolder.pmiInsertEntire.setVisible(isrowmenu||iscolmenu); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 79f37df04..3a88fc40a 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -2156,7 +2156,7 @@ define([ /* read cell background color */ if (!toolbar.btnBackColor.ischanged && !paragraphColorPicker.isDummy) { - color = info.asc_getFill().asc_getColor(); + color = info.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() }; diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js index c603a4903..f3de7b667 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js @@ -189,7 +189,7 @@ define([ var me = this, palette = me.getView('EditCell').paletteFillColor, - color = me._sdkToThemeColor(me._cellInfo.asc_getFill().asc_getColor()); + color = me._sdkToThemeColor(me._cellInfo.asc_getFillColor()); if (palette) { palette.select(color); @@ -326,7 +326,7 @@ define([ me.initFontSettings(_fontInfo); // Init fill color - var color = cellInfo.asc_getFill().asc_getColor(), + var color = cellInfo.asc_getFillColor(), clr = me._sdkToThemeColor(color); $('#fill-color .color-preview').css('background-color', '#' + (_.isObject(clr) ? clr.color : clr));