From 5f81e7311a80308fa83e3e78d03c5119ec7c3820 Mon Sep 17 00:00:00 2001
From: OVSharova <olga.sharova@onlyoffice.com>
Date: Thu, 23 Dec 2021 13:53:47 +0300
Subject: [PATCH] Fix bugs

---
 .../main/app/template/Toolbar.template               | 10 ++++++----
 apps/presentationeditor/main/app/view/Animation.js   | 12 +++++++-----
 .../main/app/view/AnimationDialog.js                 |  2 +-
 apps/presentationeditor/main/app/view/Transitions.js |  4 ++--
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template
index 4744beac4..dfb584697 100644
--- a/apps/presentationeditor/main/app/template/Toolbar.template
+++ b/apps/presentationeditor/main/app/template/Toolbar.template
@@ -253,26 +253,28 @@
                         <span id="animation-spin-duration" class="btn-slot text spinner" ></span>
                     </div>
                     <div class="elset font-normal">
-                        <div class="btn-slot" style="width: 82px;" id="animation-trigger"></div>
+                        <div class="btn-slot text"  id="animation-trigger"></div>
                     </div>
                 </div>
                 <div class="separator long"></div>
                 <div class="group small">
                     <div class="elset font-normal">
+                    <div class = "text">
                         <label id="animation-repeat"></label>
                         <span id="animation-spin-repeat" class="btn-slot text spinner" ></span>
                     </div>
+                    </div>
                     <div class="elset font-normal">
                          <span class="btn-slot text" id="animation-checkbox-rewind"></span>
                     </div>
                 </div>
                 <div class="separator long"></div>
-                <div class="group small" style="width: 120px; min-width: 100px;">
+                <div class="group small" >
                     <div class="elset">
-                        <div class="btn-slot" id="animation-moveearlier"></div>
+                        <div class="btn-slot text" id="animation-moveearlier"></div>
                     </div>
                     <div class="elset font-normal">
-                        <div class="btn-slot" id="animation-movelater"></div>
+                        <div class="btn-slot text" id="animation-movelater"></div>
                     </div>
                 </div>
             </section>
diff --git a/apps/presentationeditor/main/app/view/Animation.js b/apps/presentationeditor/main/app/view/Animation.js
index c66481523..2ffe219ad 100644
--- a/apps/presentationeditor/main/app/view/Animation.js
+++ b/apps/presentationeditor/main/app/view/Animation.js
@@ -62,7 +62,7 @@ define([
                     me.fireEvent('animation:selecteffect', [combo, record]);
                 }, me));
                 me.listEffectsMore.on('click', _.bind(function () {
-                    me.fireEvent('animation:additional', [true]); // replace effect
+                    me.fireEvent('animation:additional', [me.listEffects.menuPicker.getSelectedRec().get('value') != AscFormat.ANIM_PRESET_NONE]); // replace effect
                 }, me));
             }
 
@@ -159,6 +159,7 @@ define([
                 this.lockedControls = [];
 
                 this._arrEffectName = [{group:'none', value: AscFormat.ANIM_PRESET_NONE, iconCls: 'animation-none', displayValue: this.textNone}].concat(Common.define.effectData.getEffectData());
+                _.forEach(this._arrEffectName,function (elm){elm.tip = elm.displayValue;});
                 this._arrEffectOptions = [];
                 var itemWidth = 87,
                     itemHeight = 40;
@@ -259,7 +260,7 @@ define([
                 this.numDuration = new Common.UI.MetricSpinner({
                     el: this.$el.find('#animation-spin-duration'),
                     step: 1,
-                    width: 52,
+                    width: 55,
                     value: '',
                     defaultUnit: this.txtSec,
                     maxValue: 300,
@@ -304,7 +305,7 @@ define([
                 this.numDelay = new Common.UI.MetricSpinner({
                     el: this.$el.find('#animation-spin-delay'),
                     step: 1,
-                    width: 52,
+                    width: 55,
                     value: '',
                     defaultUnit: this.txtSec,
                     maxValue: 300,
@@ -318,7 +319,8 @@ define([
 
                 this.cmbStart = new Common.UI.ComboBox({
                     cls: 'input-group-nr',
-                    menuStyle: 'width: 150px;',
+                    menuStyle: 'min-width: 100%;',
+                    editable: false,
                     lock: [_set.slideDeleted,  _set.noSlides, _set.noGraphic, _set.noAnimation],
                     data: [
                         {value: AscFormat.NODE_TYPE_CLICKEFFECT, displayValue: this.textStartOnClick},
@@ -343,7 +345,7 @@ define([
                 this.numRepeat = new Common.UI.MetricSpinner({
                     el: this.$el.find('#animation-spin-repeat'),
                     step: 1,
-                    width: 88,
+                    width: 55,
                     value: '',
                     maxValue: 1000,
                     minValue: 0,
diff --git a/apps/presentationeditor/main/app/view/AnimationDialog.js b/apps/presentationeditor/main/app/view/AnimationDialog.js
index 9684d9b1f..1b06283fe 100644
--- a/apps/presentationeditor/main/app/view/AnimationDialog.js
+++ b/apps/presentationeditor/main/app/view/AnimationDialog.js
@@ -70,7 +70,7 @@ define([
             this._state.activeGroup = this.EffectGroupData[0].id;
             this._state.activeGroupValue = this.EffectGroupData[0].value;
             this.EffectGroupData.forEach(function (item) {item.displayValue = item.caption;});
-            if ((this.options.activeEffect != undefined) && (this.options.activeEffect != AscFormat.ANIM_PRESET_NONE)){
+            if ((this.options.activeEffect != undefined) && (this.options.activeEffect != AscFormat.ANIM_PRESET_NONE) && (this.options.activeEffect !== AscFormat.ANIM_PRESET_MULTIPLE)){
                 this._state.activeEffect = this.options.activeEffect;
                 this._state.activeGroupValue = this.options.groupValue;
                 this._state.activeGroup = _.findWhere(this.EffectGroupData, {value: this._state.activeGroupValue}).id;
diff --git a/apps/presentationeditor/main/app/view/Transitions.js b/apps/presentationeditor/main/app/view/Transitions.js
index c2d9c3232..400693162 100644
--- a/apps/presentationeditor/main/app/view/Transitions.js
+++ b/apps/presentationeditor/main/app/view/Transitions.js
@@ -221,7 +221,7 @@ define([
                 this.numDuration = new Common.UI.MetricSpinner({
                     el: this.$el.find('#transit-spin-duration'),
                     step: 1,
-                    width: 50,
+                    width: 55,
                     value: '',
                     defaultUnit: this.txtSec,
                     maxValue: 300,
@@ -236,7 +236,7 @@ define([
                 this.numDelay = new Common.UI.MetricSpinner({
                     el: this.$el.find('#transit-spin-delay'),
                     step: 1,
-                    width: 60,
+                    width: 55,
                     value: '',
                     defaultUnit: this.txtSec,
                     maxValue: 300,