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

[DE][PE] Fix highlight color button

Browse source
This commit is contained in:
Julia Radzhabova 2021-07-10 22:54:51 +03:00
parent f6032f2312
commit a7c5c47b0b
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2501,9 +2501,6 @@ define([
onHighlightTransparentClick: function(item, e) { onHighlightTransparentClick: function(item, e) {
this._setMarkerColor('transparent', 'menu'); this._setMarkerColor('transparent', 'menu');
item.setChecked(true, true);
this.toolbar.btnHighlightColor.currentColor = 'transparent';
this.toolbar.btnHighlightColor.setColor(this.toolbar.btnHighlightColor.currentColor);
}, },
onParagraphColor: function(shd) { onParagraphColor: function(shd) {
@ -2968,7 +2965,8 @@ define([
var me = this; var me = this;
if (h === 'menu') { if (h === 'menu') {
me.toolbar.mnuHighlightTransparent.setChecked(false); me._state.clrhighlight = undefined;
me.onApiHighlightColor();
me.toolbar.btnHighlightColor.currentColor = strcolor; me.toolbar.btnHighlightColor.currentColor = strcolor;
me.toolbar.btnHighlightColor.setColor(me.toolbar.btnHighlightColor.currentColor); me.toolbar.btnHighlightColor.setColor(me.toolbar.btnHighlightColor.currentColor);

6
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -1965,7 +1965,8 @@ define([
var me = this; var me = this;
if (h === 'menu') { if (h === 'menu') {
me.toolbar.mnuHighlightTransparent.setChecked(false); me._state.clrhighlight = undefined;
me.onApiHighlightColor();
me.toolbar.btnHighlightColor.currentColor = strcolor; me.toolbar.btnHighlightColor.currentColor = strcolor;
me.toolbar.btnHighlightColor.setColor(me.toolbar.btnHighlightColor.currentColor); me.toolbar.btnHighlightColor.setColor(me.toolbar.btnHighlightColor.currentColor);
@ -2003,9 +2004,6 @@ define([
onHighlightTransparentClick: function(item, e) { onHighlightTransparentClick: function(item, e) {
this._setMarkerColor('transparent', 'menu'); this._setMarkerColor('transparent', 'menu');
item.setChecked(true, true);
this.toolbar.btnHighlightColor.currentColor = 'transparent';
this.toolbar.btnHighlightColor.setColor(this.toolbar.btnHighlightColor.currentColor);
}, },
onResetAutoshapes: function () { onResetAutoshapes: function () {