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

[SSE] Fix

Browse source 
Use asc_getFillColor
This commit is contained in:
Alexander Trofimov 2020-05-08 15:09:44 +03:00
parent ea5fcd1027
commit cb1c4437f7
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -1741,7 +1741,7 @@ define([
isintable = (formatTableInfo !== null), isintable = (formatTableInfo !== null),
ismultiselect = cellinfo.asc_getFlags().asc_getMultiselect(); ismultiselect = cellinfo.asc_getFlags().asc_getMultiselect();
documentHolder.ssMenu.formatTableName = (isintable) ? formatTableInfo.asc_getTableName() : null; 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.ssMenu.fontColor = cellinfo.asc_getFont().asc_getColor();
documentHolder.pmiInsertEntire.setVisible(isrowmenu||iscolmenu); documentHolder.pmiInsertEntire.setVisible(isrowmenu||iscolmenu);

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

@ -2156,7 +2156,7 @@ define([
/* read cell background color */ /* read cell background color */
if (!toolbar.btnBackColor.ischanged && !paragraphColorPicker.isDummy) { if (!toolbar.btnBackColor.ischanged && !paragraphColorPicker.isDummy) {
color = info.asc_getFill().asc_getColor(); color = info.asc_getFillColor();
if (color) { if (color) {
if (color.get_type() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { 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() }; clr = {color: Common.Utils.ThemeColor.getHexColor(color.get_r(), color.get_g(), color.get_b()), effectValue: color.get_value() };

4
apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js
View file

@ -189,7 +189,7 @@ define([
var me = this, var me = this,
palette = me.getView('EditCell').paletteFillColor, palette = me.getView('EditCell').paletteFillColor,
color = me._sdkToThemeColor(me._cellInfo.asc_getFill().asc_getColor()); color = me._sdkToThemeColor(me._cellInfo.asc_getFillColor());
if (palette) { if (palette) {
palette.select(color); palette.select(color);
@ -326,7 +326,7 @@ define([
me.initFontSettings(_fontInfo); me.initFontSettings(_fontInfo);
// Init fill color // Init fill color
var color = cellInfo.asc_getFill().asc_getColor(), var color = cellInfo.asc_getFillColor(),
clr = me._sdkToThemeColor(color); clr = me._sdkToThemeColor(color);
$('#fill-color .color-preview').css('background-color', '#' + (_.isObject(clr) ? clr.color : clr)); $('#fill-color .color-preview').css('background-color', '#' + (_.isObject(clr) ? clr.color : clr));