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

[DE] Fix Bug 33038.

Browse source
This commit is contained in:
Julia Radzhabova 2016-10-13 11:40:59 +03:00
parent f59b72e9ac
commit ee13c7a3f3
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -520,7 +520,11 @@ define([
toolbarView.btnInsertShape.toggle(false, false); toolbarView.btnInsertShape.toggle(false, false);
toolbarView.btnInsertText.toggle(false, false); toolbarView.btnInsertText.toggle(false, false);
} }
if (this.appOptions.isEdit && toolbarView && toolbarView.btnHighlightColor.pressed &&
( !_.isObject(arguments[1]) || arguments[1].id !== 'id-toolbar-btn-highlight')) {
this.api.SetMarkerFormat(false);
toolbarView.btnHighlightColor.toggle(false, false);
}
application.getController('DocumentHolder').getView('DocumentHolder').focus(); application.getController('DocumentHolder').getView('DocumentHolder').focus();
if (this.api) { if (this.api) {

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

@ -2554,7 +2554,7 @@ define([
me.api.SetMarkerFormat(true, true, parseInt(r, 16), parseInt(g, 16), parseInt(b, 16)); me.api.SetMarkerFormat(true, true, parseInt(r, 16), parseInt(g, 16), parseInt(b, 16));
} }
Common.NotificationCenter.trigger('edit:complete', me.toolbar); Common.NotificationCenter.trigger('edit:complete', me.toolbar, me.toolbar.btnHighlightColor);
Common.component.Analytics.trackEvent('ToolBar', 'Highlight Color'); Common.component.Analytics.trackEvent('ToolBar', 'Highlight Color');
}, },