From 5aa980df913522786ce5af33bb669712c9d532a3 Mon Sep 17 00:00:00 2001
From: OVSharova <olga.sharova@onlyoffice.com>
Date: Tue, 27 Jul 2021 13:50:13 +0300
Subject: [PATCH] moove tab create

---
 .../main/app/controller/Toolbar.js             | 18 +++++++++++++-----
 .../main/app/template/Toolbar.template         |  1 +
 .../main/app/template/Transitions.template     |  2 +-
 .../main/app/view/Toolbar.js                   |  2 ++
 .../main/app/view/Transitions.js               |  2 +-
 .../main/resources/less/Transitions.less       |  4 ++++
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js
index ce22ba37f..8d6f90248 100644
--- a/apps/presentationeditor/main/app/controller/Toolbar.js
+++ b/apps/presentationeditor/main/app/controller/Toolbar.js
@@ -130,7 +130,8 @@ define([
                     'add:slide'         : this.onAddSlide.bind(this),
                     'change:slide'      : this.onChangeSlide.bind(this),
                     'change:compact'    : this.onClickChangeCompact,
-                    'add:chart'         : this.onSelectChart
+                    'add:chart'         : this.onSelectChart,
+                    'transit:settab'    : this.setTrantitTab
                 },
                 'FileMenu': {
                     'menu:hide': this.onFileMenu.bind(this, 'hide'),
@@ -2385,7 +2386,14 @@ define([
             this.toolbar.createDelayedElements();
             this.attachUIEvents(this.toolbar);
         },
-
+        setTrantitTab:function (){
+            var tab = {action: 'transit', caption: this.toolbar.textTabTransitions};
+            var $panel = this.getApplication().getController('Transitions').createToolbarPanel();
+            if ( $panel ) {
+                this.toolbar.addTab(tab, $panel, 3);
+                this.toolbar.setVisible('transit', true);
+            }
+        },
         onAppShowed: function (config) {
             var me = this;
 
@@ -2403,15 +2411,15 @@ define([
             var tab = {action: 'review', caption: me.toolbar.textTabCollaboration};
             var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel();
             if ( $panel ) {
-                me.toolbar.addTab(tab, $panel, 3);
+                me.toolbar.addTab(tab, $panel, 4);
                 me.toolbar.setVisible('review', config.isEdit || config.canViewReview || config.canCoAuthoring && config.canComments);
             }
-            var tab = {action: 'transit', caption: me.toolbar.textTabTransitions};
+            /*var tab = {action: 'transit', caption: me.toolbar.textTabTransitions};
             var $panel = me.getApplication().getController('Transitions').createToolbarPanel();
             if ( $panel ) {
                 me.toolbar.addTab(tab, $panel, 3);
                 me.toolbar.setVisible('transit', true);
-            }
+            }*/
             if ( config.isEdit ) {
                 me.toolbar.setMode(config);
 
diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template
index e467ca86c..1889c6aa8 100644
--- a/apps/presentationeditor/main/app/template/Toolbar.template
+++ b/apps/presentationeditor/main/app/template/Toolbar.template
@@ -142,6 +142,7 @@
                     <span class="btn-slot text x-huge" id="slot-btn-insvideo"></span>
                 </div>
             </section>
+           <!-- <section id="transitions-panel" class="panel" data-tab="transit"> </section>-->
         </section>
     </section>
 </div>
\ No newline at end of file
diff --git a/apps/presentationeditor/main/app/template/Transitions.template b/apps/presentationeditor/main/app/template/Transitions.template
index 9df2ef558..132a98fe0 100644
--- a/apps/presentationeditor/main/app/template/Transitions.template
+++ b/apps/presentationeditor/main/app/template/Transitions.template
@@ -1,4 +1,4 @@
-<section id="transitions-panel" class="panel" data-tab="transit"> 
+<section id="transitions-panel" class="panel" data-tab="transit">
     <div class="group flex small" id="transit-field-effects" style=" width: 63%; min-width: 300px; " ></div>
 
     <div class="group small">
diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js
index 806e4da1f..56b52a647 100644
--- a/apps/presentationeditor/main/app/view/Toolbar.js
+++ b/apps/presentationeditor/main/app/view/Toolbar.js
@@ -987,6 +987,7 @@ define([
                 me.isCompactView = mode.compactview;
                 if ( mode.isEdit ) {
                     me.$el.html(me.rendererComponents(me.$layout));
+
                 } else {
                     me.$layout.find('.canedit').hide();
                     me.$layout.addClass('folded');
@@ -1005,6 +1006,7 @@ define([
                 if ( mode.isEdit ) {
                     me.setTab('home');
                     me.processPanelVisible();
+                    this.fireEvent('transit:settab',[this]);
                 }
 
                 if ( me.isCompactView )
diff --git a/apps/presentationeditor/main/app/view/Transitions.js b/apps/presentationeditor/main/app/view/Transitions.js
index 031198c0f..87e97df98 100644
--- a/apps/presentationeditor/main/app/view/Transitions.js
+++ b/apps/presentationeditor/main/app/view/Transitions.js
@@ -261,7 +261,7 @@ define([
                 });
 
                 this.chStartOnClick = new Common.UI.CheckBox({
-                    el: this.$el.findById('#transit-checkbox-slidenum'),
+                    el: this.$el.find('#transit-checkbox-slidenum'),
                     labelText: this.strStartOnClick
                 });
 
diff --git a/apps/presentationeditor/main/resources/less/Transitions.less b/apps/presentationeditor/main/resources/less/Transitions.less
index 4e7b1a57a..0fc708237 100644
--- a/apps/presentationeditor/main/resources/less/Transitions.less
+++ b/apps/presentationeditor/main/resources/less/Transitions.less
@@ -2,6 +2,10 @@
   input {
     text-align: left;
   }
+  .dropdown-menu li a{
+    padding: 7px 20px;
+
+  }
 
   .item {
     background: transparent;