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

Merge pull request #1686 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2022-04-06 18:08:47 +03:00 committed by GitHub
parent 7daad891f8 0419ed8907
commit fbbf4d1142
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4159,9 +4159,10 @@ define([
if (frame_pr) if (frame_pr)
menuDropCapAdvanced.setIconCls(frame_pr.get_DropCap()===Asc.c_oAscDropCap.Drop ? 'menu__icon dropcap-intext' : 'menu__icon dropcap-inmargin'); menuDropCapAdvanced.setIconCls(frame_pr.get_DropCap()===Asc.c_oAscDropCap.Drop ? 'menu__icon dropcap-intext' : 'menu__icon dropcap-inmargin');
menuStyleSeparator.setVisible(me.mode.canEditStyles && !isInChart); var edit_style = me.mode.canEditStyles && !isInChart && !(value.imgProps && value.imgProps.isSmartArtInternal);
menuStyle.setVisible(me.mode.canEditStyles && !isInChart); menuStyleSeparator.setVisible(edit_style);
if (me.mode.canEditStyles && !isInChart) { menuStyle.setVisible(edit_style);
if (edit_style) {
me.menuStyleUpdate.setCaption(me.updateStyleText.replace('%1', DE.getController('Main').translationTable[window.currentStyleName] || window.currentStyleName)); me.menuStyleUpdate.setCaption(me.updateStyleText.replace('%1', DE.getController('Main').translationTable[window.currentStyleName] || window.currentStyleName));
} }

5
apps/presentationeditor/main/app/controller/Animation.js
View file

@ -475,9 +475,12 @@ define([
this._state.TriggerValue = this.AnimationProperties.asc_getTriggerObjectClick(); this._state.TriggerValue = this.AnimationProperties.asc_getTriggerObjectClick();
} }
this.setTriggerList(); this.setTriggerList();
} else {
this._state.Effect = this._state.EffectGroup = this._state.EffectOption = undefined;
if (this.view && this.view.listEffects)
this.view.listEffects.fieldPicker.deselectAll();
} }
this.setLocked(); this.setLocked();
}, },
setTriggerList: function (){ setTriggerList: function (){