From eb908f5fc0d33779cbcf0dfbe70b75df2654aa35 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Wed, 8 Aug 2018 12:01:21 +0300
Subject: [PATCH] [PE] Fix Bug 37499

---
 .../main/app/controller/Statusbar.js          | 26 ++++++++++++++++---
 .../main/app/template/StatusBar.template      |  4 ++-
 .../main/app/view/Statusbar.js                | 21 ++++++++++++---
 apps/presentationeditor/main/locale/en.json   |  3 +++
 .../main/resources/less/statusbar.less        |  4 ---
 5 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/apps/presentationeditor/main/app/controller/Statusbar.js b/apps/presentationeditor/main/app/controller/Statusbar.js
index 87ef917253..c2635a5ee5 100644
--- a/apps/presentationeditor/main/app/controller/Statusbar.js
+++ b/apps/presentationeditor/main/app/controller/Statusbar.js
@@ -99,7 +99,8 @@ define([
             this.statusbar.btnZoomToPage.on('click', _.bind(this.onBtnZoomTo, this, 'topage'));
             this.statusbar.btnZoomToWidth.on('click', _.bind(this.onBtnZoomTo, this, 'towidth'));
             this.statusbar.zoomMenu.on('item:click', _.bind(this.menuZoomClick, this));
-            this.statusbar.btnPreview.on('click', _.bind(this.onPreview, this));
+            this.statusbar.btnPreview.on('click', _.bind(this.onPreviewBtnClick, this));
+            this.statusbar.btnPreview.menu.on('item:click', _.bind(this.onPreviewItemClick, this));
             this.statusbar.btnSetSpelling.on('click', _.bind(this.onBtnSpelling, this));
         },
 
@@ -137,9 +138,26 @@ define([
             Common.NotificationCenter.trigger('edit:complete', this.statusbar);
         },
 
-        onPreview: function(btn, e) {
-            var current = this.api.getCurrentPage();
-            Common.NotificationCenter.trigger('preview:start', _.isNumber(current) ? current : 0);
+        onPreview: function(slidenum, presenter) {
+            Common.NotificationCenter.trigger('preview:start', _.isNumber(slidenum) ? slidenum : 0, presenter);
+        },
+
+        onPreviewBtnClick: function(btn, e) {
+            this.onPreview(this.api.getCurrentPage());
+        },
+
+        onPreviewItemClick: function(menu, item) {
+            switch (item.value) {
+                case 0:
+                    this.onPreview(0);
+                    break;
+                case 1:
+                    this.onPreview(this.api.getCurrentPage());
+                    break;
+                case 2:
+                    this.onPreview(0, true);
+                    break;
+            }
         },
 
         /*
diff --git a/apps/presentationeditor/main/app/template/StatusBar.template b/apps/presentationeditor/main/app/template/StatusBar.template
index 898b9759f9..8fe9e79a29 100644
--- a/apps/presentationeditor/main/app/template/StatusBar.template
+++ b/apps/presentationeditor/main/app/template/StatusBar.template
@@ -1,7 +1,9 @@
 
 <div class="statusbar" style="display:table;">
+    <div class="status-group">
+        <div id="slot-status-btn-preview" style="display: inline-block;margin-left: 9px;"></div>
+    </div>
     <div class="status-group dropup">
-        <button id="status-btn-preview" type="button" class="btn small btn-toolbar" style="margin-left: 9px;"><i class="icon"></i></button>
         <label id="status-label-pages" class="status-label dropdown-toggle" style="margin-left: 7px; display: none;" data-toggle="dropdown"><%= Common.Utils.String.format(scope.pageIndexText, 1, 1) %></label>
         <div id="status-goto-box" class="dropdown-menu">
             <label style="float:left;line-height:22px;"><%= scope.goToPageText %></label>
diff --git a/apps/presentationeditor/main/app/view/Statusbar.js b/apps/presentationeditor/main/app/view/Statusbar.js
index ddad2dda6b..37115083bd 100644
--- a/apps/presentationeditor/main/app/view/Statusbar.js
+++ b/apps/presentationeditor/main/app/view/Statusbar.js
@@ -235,10 +235,22 @@ define([
                 );
 
                 this.btnPreview = new Common.UI.Button({
-                    el: $('#status-btn-preview',this.el),
+                    cls: 'btn-toolbar',
+                    iconCls: 'btn-preview',
                     hint: this.tipPreview,
-                    hintAnchor: 'top'
+                    hintAnchor: 'top',
+                    split: true,
+                    menu: new Common.UI.Menu({
+                        menuAlign: 'bl-tl',
+                        style: 'margin-top:-5px;',
+                        items: [
+                            {caption: this.textShowBegin, value: 0},
+                            {caption: this.textShowCurrent, value: 1},
+                            {caption: this.textShowPresenterView, value: 2}
+                        ]
+                    })
                 });
+                this.btnPreview.render($('#slot-status-btn-preview'));
 
                 this.btnDocLanguage = new Common.UI.Button({
                     el: $('#btn-doc-lang',this.el),
@@ -413,7 +425,10 @@ define([
             tipAccessRights : 'Manage document access rights',
             tipSetLang      : 'Set Text Language',
             tipSetDocLang   : 'Set Document Language',
-            tipSetSpelling  : 'Spell checking'
+            tipSetSpelling  : 'Spell checking',
+            textShowBegin: 'Show from Beginning',
+            textShowCurrent: 'Show from Current slide',
+            textShowPresenterView: 'Show presenter view'
         }, PE.Views.Statusbar || {}));
     }
 );
\ No newline at end of file
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index 5c9081ff8e..a9609ceca9 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -1304,6 +1304,9 @@
   "PE.Views.Statusbar.tipZoomIn": "Zoom in",
   "PE.Views.Statusbar.tipZoomOut": "Zoom out",
   "PE.Views.Statusbar.txtPageNumInvalid": "Invalid slide number",
+  "PE.Views.Statusbar.textShowBegin": "Show from Beginning",
+  "PE.Views.Statusbar.textShowCurrent": "Show from Current Slide",
+  "PE.Views.Statusbar.textShowPresenterView": "Show Presenter View",
   "PE.Views.TableSettings.deleteColumnText": "Delete Column",
   "PE.Views.TableSettings.deleteRowText": "Delete Row",
   "PE.Views.TableSettings.deleteTableText": "Delete Table",
diff --git a/apps/presentationeditor/main/resources/less/statusbar.less b/apps/presentationeditor/main/resources/less/statusbar.less
index ee7a26786b..06db67d6de 100644
--- a/apps/presentationeditor/main/resources/less/statusbar.less
+++ b/apps/presentationeditor/main/resources/less/statusbar.less
@@ -67,10 +67,6 @@
         margin-right: 5px;
     }
 
-    #status-btn-preview {
-        .btn-tpl(-160px);
-    }
-
     .status-group {
         display: table-cell;
         white-space: nowrap;