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

Fix Bug 40330

Browse source
This commit is contained in:
Julia Radzhabova 2019-03-27 10:23:00 +03:00
parent 7653dc866d
commit a81de8611f
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -232,7 +232,6 @@ define([
this.btnColor.setColor(color); this.btnColor.setColor(color);
var clr_item = this.btnColor.menu.$el.find('#control-settings-system-color > a'); var clr_item = this.btnColor.menu.$el.find('#control-settings-system-color > a');
clr_item.hasClass('selected') && clr_item.removeClass('selected'); clr_item.hasClass('selected') && clr_item.removeClass('selected');
this._isCanApplyColor = true;
this.isSystemColor = false; this.isSystemColor = false;
}, },
@ -250,7 +249,6 @@ define([
this.colors.clearSelection(); this.colors.clearSelection();
var clr_item = this.btnColor.menu.$el.find('#control-settings-system-color > a'); var clr_item = this.btnColor.menu.$el.find('#control-settings-system-color > a');
!clr_item.hasClass('selected') && clr_item.addClass('selected'); !clr_item.hasClass('selected') && clr_item.addClass('selected');
this._isCanApplyColor = true;
this.isSystemColor = true; this.isSystemColor = true;
}, },
@ -275,7 +273,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.isSystemColor = this._isCanApplyColor = !!val; this.isSystemColor = (val===null);
if (val) { if (val) {
val = Common.Utils.ThemeColor.getHexColor(val.get_r(), val.get_g(), val.get_b()); val = Common.Utils.ThemeColor.getHexColor(val.get_r(), val.get_g(), val.get_b());
this.colors.selectByRGB(val,true); this.colors.selectByRGB(val,true);
@ -300,13 +298,11 @@ 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._isCanApplyColor) { if (this.isSystemColor) {
if (this.isSystemColor) { props.put_Color(null);
props.put_Color(null); } else {
} else { 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());
}
} }
var lock = Asc.c_oAscSdtLockType.Unlocked; var lock = Asc.c_oAscSdtLockType.Unlocked;
@ -336,13 +332,11 @@ 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) { if (this.isSystemColor) {
if (this.isSystemColor) { props.put_Color(null);
props.put_Color(null); } else {
} else { 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);
} }