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

Bug 40330

Browse source
This commit is contained in:
Julia Radzhabova 2019-01-29 15:27:59 +03:00 committed by Alexey Golubev
parent 1a641c11cd
commit 92d17aee04
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -223,7 +223,7 @@ define([
onColorsSelect: function(picker, color) { onColorsSelect: function(picker, color) {
this.btnColor.setColor(color); this.btnColor.setColor(color);
this._isColorChanged = true; this._isCanApplyColor = true;
}, },
updateThemeColors: function() { updateThemeColors: function() {
@ -255,6 +255,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();
this._isCanApplyColor = !!val;
val = (val) ? Common.Utils.ThemeColor.getHexColor(val.get_r(), val.get_g(), val.get_b()) : 'transparent'; val = (val) ? Common.Utils.ThemeColor.getHexColor(val.get_r(), val.get_g(), val.get_b()) : 'transparent';
this.btnColor.setColor(val); this.btnColor.setColor(val);
this.colors.selectByRGB(val,true); this.colors.selectByRGB(val,true);
@ -272,7 +273,7 @@ define([
props.put_Tag(this.txtTag.getValue()); props.put_Tag(this.txtTag.getValue());
props.put_Appearance(this.cmbShow.getValue()); props.put_Appearance(this.cmbShow.getValue());
if (this._isColorChanged) { if (this._isCanApplyColor) {
var color = Common.Utils.ThemeColor.getRgbColor(this.colors.getColor()); var color = Common.Utils.ThemeColor.getRgbColor(this.colors.getColor());
props.put_Color(color.get_r(), color.get_g(), color.get_b()); props.put_Color(color.get_r(), color.get_g(), color.get_b());
} }
@ -308,8 +309,10 @@ define([
if (this.api) { if (this.api) {
var props = new AscCommon.CContentControlPr(); var props = new AscCommon.CContentControlPr();
props.put_Appearance(this.cmbShow.getValue()); props.put_Appearance(this.cmbShow.getValue());
if (this._isCanApplyColor) {
var color = Common.Utils.ThemeColor.getRgbColor(this.colors.getColor()); var color = Common.Utils.ThemeColor.getRgbColor(this.colors.getColor());
props.put_Color(color.get_r(), color.get_g(), color.get_b()); props.put_Color(color.get_r(), color.get_g(), color.get_b());
}
this.api.asc_SetContentControlProperties(props, null, true); this.api.asc_SetContentControlProperties(props, null, true);
} }
}, },