pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-25 01:31:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

[DE] Fix Bug 52287

Browse Source
This commit is contained in:
Julia Radzhabova
2021-11-16 13:29:22 +03:00
parent 3ece9ea764
commit c40fa6226c
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/documenteditor/main/app/view/ControlSettingsDialog.js
View File

@ -555,8 +555,11 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
if (this.btnColor.isAutoColor()) {
props.put_Color(null);
} else {
var color = Common.Utils.ThemeColor.getRgbColor(this.colors.getColor());
props.put_Color(color.get_r(), color.get_g(), color.get_b());
var color = this.colors.getColor() || this.btnColor.color;
if (color) {
color = Common.Utils.ThemeColor.getRgbColor(color);
props.put_Color(color.get_r(), color.get_g(), color.get_b());
}
}
var lock = Asc.c_oAscSdtLockType.Unlocked;
@ -665,8 +668,11 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
if (this.btnColor.isAutoColor()) {
props.put_Color(null);
} else {
var color = Common.Utils.ThemeColor.getRgbColor(this.colors.getColor());
props.put_Color(color.get_r(), color.get_g(), color.get_b());
var color = this.colors.getColor() || this.btnColor.color;
if (color) {
color = Common.Utils.ThemeColor.getRgbColor(color);
props.put_Color(color.get_r(), color.get_g(), color.get_b());
}
}
this.api.asc_SetContentControlProperties(props, null, true);
}