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

Merge pull request #359 from ONLYOFFICE/feature/for-hotfix-5.5.1

Browse source 
Feature/for hotfix 5.5.1
This commit is contained in:
Julia Radzhabova 2020-03-05 14:43:32 +03:00 committed by GitHub
parent cb4576cd8d 7623c035b4
commit b7dfd67d58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
apps/spreadsheeteditor/main/app/view/CellSettings.js
View file

@ -481,24 +481,29 @@ define([
} else if (this.pattern !== null) {
if (this.pattern.asc_getType() === -1) {
var color = this.pattern.asc_getFgColor();
if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
this.CellColor = {
if (color) {
if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) {
this.CellColor = {
Value: 1,
Color: {
color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()),
effectValue: color.asc_getValue()
}
};
} else {
this.CellColor = {
Value: 1,
Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())
};
}
this.FGColor = {
Value: 1,
Color: {
color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()),
effectValue: color.asc_getValue()
}
Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color)
};
} else {
this.CellColor = {
Value: 1,
Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())
};
this.FGColor = this.CellColor = {Value: 1, Color: 'ffffff'};
}
this.FGColor = {
Value: 1,
Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color)
};
this.BGColor = {Value: 1, Color: 'ffffff'};
this.sldrGradient.setThumbs(2);
this.GradColor.colors.length = 0;
@ -536,7 +541,7 @@ define([
};
}
} else
this.FGColor = {Value: 1, Color: {color: '4f81bd', effectId: 24}};
this.FGColor = {Value: 1, Color: {color: '000000', effectId: 24}};
color = this.pattern.asc_getBgColor();
if (color) {