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

[DE] Fix Bug 40330

Browse source
This commit is contained in:
Julia Radzhabova 2019-01-25 12:26:06 +03:00
parent 9bfe3b3294
commit 1a641c11cd
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -223,6 +223,7 @@ define([
onColorsSelect: function(picker, color) { onColorsSelect: function(picker, color) {
this.btnColor.setColor(color); this.btnColor.setColor(color);
this._isColorChanged = true;
}, },
updateThemeColors: function() { updateThemeColors: function() {
@ -254,7 +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();
val = (val) ? Common.Utils.ThemeColor.getHexColor(val.get_r(), val.get_g(), val.get_b()) : '#000000'; 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);
@ -271,8 +272,10 @@ 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());
var color = Common.Utils.ThemeColor.getRgbColor(this.colors.getColor()); if (this._isColorChanged) {
props.put_Color(color.get_r(), color.get_g(), color.get_b()); var color = Common.Utils.ThemeColor.getRgbColor(this.colors.getColor());
props.put_Color(color.get_r(), color.get_g(), color.get_b());
}
var lock = Asc.c_oAscSdtLockType.Unlocked; var lock = Asc.c_oAscSdtLockType.Unlocked;