From f18b8fea327633f5ef5aaaf45ba8e4b9a183e371 Mon Sep 17 00:00:00 2001
From: OVSharova <olga.sharova@onlyoffice.com>
Date: Mon, 26 Jul 2021 11:20:16 +0300
Subject: [PATCH] Some edit

---
 .../main/app/controller/Transitions.js        |  8 -------
 .../main/app/template/Transitions.template    |  8 +++----
 .../main/app/view/Transitions.js              | 21 +++++++++----------
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/apps/presentationeditor/main/app/controller/Transitions.js b/apps/presentationeditor/main/app/controller/Transitions.js
index 0f2fc0783..3f27510cf 100644
--- a/apps/presentationeditor/main/app/controller/Transitions.js
+++ b/apps/presentationeditor/main/app/controller/Transitions.js
@@ -82,11 +82,6 @@ define([
         setConfig: function (data, api) {
             this.setApi(api);
             this.api.asc_registerCallback('asc_onFocusObject',          _.bind(this.onFocusObject, this));
-            if (data) {
-
-                this.currentUserId      =   data.config.user.id;
-                this.sdkViewName        =   data['sdkviewname'] || this.sdkViewName;
-            }
             return this;
         },
         setApi: function (api) {
@@ -122,9 +117,6 @@ define([
         onAppReady: function (config) {
             var me = this;
 
-            /*if (me.view) {
-                me.applySettings();
-                           }*/
         },
         onPreviewClick: function(){
             if (this.api) {
diff --git a/apps/presentationeditor/main/app/template/Transitions.template b/apps/presentationeditor/main/app/template/Transitions.template
index ce771f138..8ba8fdde2 100644
--- a/apps/presentationeditor/main/app/template/Transitions.template
+++ b/apps/presentationeditor/main/app/template/Transitions.template
@@ -15,13 +15,13 @@
         </div>
     </div>
     <div class="separator long"></div>
-    <div class="group small">
+    <div class="group small" >
         <div class="elset">
             <span class="btn-slot text" id="transit-checkbox-slidenum"></span>
         </div>
-        <div class="elset">
-            <span class="btn-slot text" id="label-delay" style="display: inline-block; float: left; width: 8px;font-size: 11px;text-align: left; margin-top: 4px" >Delay</span>
-            <span id="transit-spin-delay" class="btn-slot text spinner" style="display: inline-block; float: right; width: 30px; "></span>
+        <div class="elset" style="width:110px;">
+            <span class="btn-slot text" id="label-delay" style="display: inline-block; float: left; font-size: 11px;text-align: left; margin-top: 4px" >Delay</span>
+            <span id="transit-spin-delay" class="btn-slot text spinner" style="display: inline-block;  float: right; width: 90px; "></span>
         </div>
     </div>
     <div class="separator long"></div>
diff --git a/apps/presentationeditor/main/app/view/Transitions.js b/apps/presentationeditor/main/app/view/Transitions.js
index 40ce66ec5..da64a56bf 100644
--- a/apps/presentationeditor/main/app/view/Transitions.js
+++ b/apps/presentationeditor/main/app/view/Transitions.js
@@ -63,6 +63,7 @@ define([
                 me.listEffects.on('click', _.bind(function (combo,record){
                     me.fireEvent('transit:selecteffect',[combo,record]);
                 },me));
+
             }
             if(me.btnPreview)
             {
@@ -223,12 +224,13 @@ define([
                     iconCls: 'toolbar__icon btn-rem-comment'
                 });
 
-               this.btnParametrs = new Common.UI.Button({
+                this.btnParametrs = new Common.UI.Button({
                     cls: 'btn-toolbar x-huge icon-top',
                     caption: this.txtParametrs,
                     split: true,
                     iconCls: 'toolbar__icon btn-res-comment'
                 });
+
                 this.btnApplyToAll = new Common.UI.Button({
                     cls: 'btn-toolbar',
                     caption: this.txtApplyToAll,
@@ -246,6 +248,7 @@ define([
                     minValue: 0,
                     disabled: false
                 });
+
                 this.numDelay = new Common.UI.MetricSpinner({
                     el: this.$el.find('#transit-spin-delay'),
                     step: 1,
@@ -256,10 +259,12 @@ define([
                     minValue: 0,
                     disabled: false
                 });
+
                 this.chStartOnClick = new Common.UI.CheckBox({
                     el: this.$el.findById('#transit-checkbox-slidenum'),
                     labelText: this.strStartOnClick
                 });
+
                 Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
             },
 
@@ -274,9 +279,6 @@ define([
                 (new Promise(function (accept, reject) {
                     accept();
                 })).then(function(){
-                    var menuTemplate = _.template('<a id="<%= id %>" tabindex="-1" type="menuitem"><div><%= caption %></div>' +
-                        '<% if (options.description !== null) { %><label style="display: block;color: #a5a5a5;cursor: pointer;white-space: normal;"><%= options.description %></label>' +
-                        '<% } %></a>');
                     var itemsMenu=[];
                     _.each(me._arrEffectType, function (item){
                         itemsMenu.push(
@@ -294,10 +296,7 @@ define([
                             items: itemsMenu
                         })
                     );
-
-
-
-                   setEvents.call(me);
+                    setEvents.call(me);
                 });
             },
 
@@ -382,9 +381,9 @@ define([
                 if(effect!=Asc.c_oAscSlideTransitionTypes.None)
                     selectedElement.setChecked(true);
 
-                this.btnParametrs.setDisabled(effect==Asc.c_oAscSlideTransitionTypes.None);
-                this.btnPreview.setDisabled(effect==Asc.c_oAscSlideTransitionTypes.None);
-                this.numDuration.setDisabled(effect==Asc.c_oAscSlideTransitionTypes.None);
+                this.btnParametrs.setDisabled(effect===Asc.c_oAscSlideTransitionTypes.None);
+                this.btnPreview.setDisabled(effect===Asc.c_oAscSlideTransitionTypes.None);
+                this.numDuration.setDisabled(effect===Asc.c_oAscSlideTransitionTypes.None);
                 return selectedElement;
             },