From 44fd700fc334f8aef63c72ca11b77983917c185a Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Fri, 21 Jan 2022 13:19:13 +0300
Subject: [PATCH] [PE] Fix bugs

---
 apps/presentationeditor/main/app/controller/Animation.js | 7 ++++---
 apps/presentationeditor/main/app/view/Animation.js       | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/presentationeditor/main/app/controller/Animation.js b/apps/presentationeditor/main/app/controller/Animation.js
index 86b5f83ce2..75b9da10c4 100644
--- a/apps/presentationeditor/main/app/controller/Animation.js
+++ b/apps/presentationeditor/main/app/controller/Animation.js
@@ -319,7 +319,10 @@ define([
         onEffectSelect: function (combo, record) {
             if (this.api) {
                 var type = record.get('value');
-                var group = (type != AscFormat.ANIM_PRESET_NONE) ? _.findWhere(this.EffectGroups, {id: record.get('group')}).value : undefined;
+                if (type===AscFormat.ANIM_PRESET_MULTIPLE) return;
+
+                var group = _.findWhere(this.EffectGroups, {id: record.get('group')});
+                group = group ? group.value : undefined;
                 this.addNewEffect(type, group, record.get('group'),this._state.Effect != AscFormat.ANIM_PRESET_NONE);
             }
         },
@@ -331,8 +334,6 @@ define([
             }
         },
 
-
-
         onCheckRewindChange: function (field, newValue, oldValue, eOpts) {
             if (this.api && this.AnimationProperties) {
                 this.AnimationProperties.asc_putRewind(field.getValue() == 'checked');
diff --git a/apps/presentationeditor/main/app/view/Animation.js b/apps/presentationeditor/main/app/view/Animation.js
index 6dc9ce214b..3c40d3120a 100644
--- a/apps/presentationeditor/main/app/view/Animation.js
+++ b/apps/presentationeditor/main/app/view/Animation.js
@@ -505,10 +505,12 @@ define([
                                 me.fireEvent('animation:addanimation', [picker, record]);
                         });
                         menu.off('show:before', onShowBefore);
+                        menu.on('show:after', function () {
+                            picker.scroller.update({alwaysVisibleY: true});
+                        });
                         me.btnAddAnimation.menu.setInnerMenu([{menu: picker, index: 0}]);
                     };
                     me.btnAddAnimation.menu.on('show:before', onShowBefore);
-
                     setEvents.call(me);
                 });
             },