From f51a11d31661eb1f83a13f9e3700ea8c7a8f18aa Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 6 Apr 2022 17:25:01 +0300 Subject: [PATCH 1/2] [DE] Fix Bug 56490 --- apps/documenteditor/main/app/view/DocumentHolder.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 0dbfbb093..9eb57affc 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -4159,9 +4159,10 @@ define([ if (frame_pr) menuDropCapAdvanced.setIconCls(frame_pr.get_DropCap()===Asc.c_oAscDropCap.Drop ? 'menu__icon dropcap-intext' : 'menu__icon dropcap-inmargin'); - menuStyleSeparator.setVisible(me.mode.canEditStyles && !isInChart); - menuStyle.setVisible(me.mode.canEditStyles && !isInChart); - if (me.mode.canEditStyles && !isInChart) { + var edit_style = me.mode.canEditStyles && !isInChart && !(value.imgProps && value.imgProps.isSmartArtInternal); + menuStyleSeparator.setVisible(edit_style); + menuStyle.setVisible(edit_style); + if (edit_style) { me.menuStyleUpdate.setCaption(me.updateStyleText.replace('%1', DE.getController('Main').translationTable[window.currentStyleName] || window.currentStyleName)); } From 0419ed890738acd017a07ee9590895f787682962 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 6 Apr 2022 17:47:50 +0300 Subject: [PATCH 2/2] [PE] Fix Bug 56449 --- apps/presentationeditor/main/app/controller/Animation.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/presentationeditor/main/app/controller/Animation.js b/apps/presentationeditor/main/app/controller/Animation.js index 4b36a0e52..b1edcf2ba 100644 --- a/apps/presentationeditor/main/app/controller/Animation.js +++ b/apps/presentationeditor/main/app/controller/Animation.js @@ -475,9 +475,12 @@ define([ this._state.TriggerValue = this.AnimationProperties.asc_getTriggerObjectClick(); } 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(); - }, setTriggerList: function (){