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

[DE] Fix 38604

Browse source
This commit is contained in:
Julia Radzhabova 2018-08-28 17:52:21 +03:00
parent e33946f4bd
commit 5667132024
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -897,7 +897,7 @@ define([
if (show){ if (show){
var clr = this.api.asc_GetGlobalContentControlHighlightColor(); var clr = this.api.asc_GetGlobalContentControlHighlightColor();
if (clr) { if (clr) {
clr = Common.Utils.ThemeColor.getHexColor(clr.r, clr.g, clr.b); clr = Common.Utils.ThemeColor.getHexColor(clr.get_r(), clr.get_g(), clr.get_b());
this.toolbar.mnuControlsColorPicker.selectByRGB(clr, true); this.toolbar.mnuControlsColorPicker.selectByRGB(clr, true);
} }
} }

2
apps/documenteditor/main/app/view/ControlSettingsDialog.js
View file

@ -247,7 +247,7 @@ define([
(val!==null && val!==undefined) && this.cmbShow.setValue(val); (val!==null && val!==undefined) && this.cmbShow.setValue(val);
val = props.get_Color(); val = props.get_Color();
val = (val) ? Common.Utils.ThemeColor.getHexColor(val.r, val.g, val.b) : '#000000'; val = (val) ? Common.Utils.ThemeColor.getHexColor(val.get_r(), val.get_g(), val.get_b()) : '#000000';
this.btnColor.setColor(val); this.btnColor.setColor(val);
this.colors.selectByRGB(val,true); this.colors.selectByRGB(val,true);