Merge pull request #2989 from ONLYOFFICE/fix/fix-bugs

[PE] Fix bug 67536
ONLYOFFICE · May 15, 2024 · a3aa30d · a3aa30d
2 parents 161b1a5 + 9e26cd9
commit a3aa30d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/apps/presentationeditor/main/app/controller/Animation.js b/apps/presentationeditor/main/app/controller/Animation.js
@@ -112,7 +112,9 @@ define([
             this.api.asc_registerCallback('asc_onAnimPreviewStarted',   _.bind(this.onAnimPreviewStarted, this));
             this.api.asc_registerCallback('asc_onAnimPreviewFinished',  _.bind(this.onAnimPreviewFinished, this));
             this.api.asc_onShowAnimTab(!!this._state.onactivetab)
-            this.api.asc_registerCallback('asc_onCloseAnimPane',        _.bind(this.onCloseAnimPane, this));
+            this.api.asc_registerCallback('asc_onCloseAnimPane',        _.bind(this.onApiCloseAnimPane, this));
+
+            Common.NotificationCenter.on('animpane:close',              _.bind(this.onCloseAnimPane, this));
             return this;
         },
 
@@ -174,13 +176,23 @@ define([
         },
 
         onAnimationPane: function(btn) {
+            this._state.isAnimPaneVisible = btn.pressed;
             this.api.asc_ShowAnimPane(btn.pressed);
         },
 
-        onCloseAnimPane: function () {
+        onApiCloseAnimPane: function () {
+            this._state.isAnimPaneVisible = false;
             this.view.btnAnimationPane.toggle(false, true);
         },
 
+        onCloseAnimPane: function () {
+            if (this._state.isAnimPaneVisible) {
+                this._state.isAnimPaneVisible = false;
+                this.api.asc_ShowAnimPane(false);
+                this.view.btnAnimationPane.toggle(false, true);
+            }
+        },
+
         onAnimationAdditional: function(replace) { // replace or add new additional effect
             var me = this;
             (new PE.Views.AnimationDialog({

diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js
@@ -248,6 +248,7 @@ define([
                 break;
                 case 'history':
                     if (!this.leftMenu.panelHistory.isVisible()) {
+                        Common.NotificationCenter.trigger('animpane:close');
                         if (this.api.isDocumentModified()) {
                             var me = this;
                             this.api.asc_stopSaving();