From 30e77f802bded68b0c9058bdfaf28f2548990e22 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 28 Apr 2016 17:43:48 +0300 Subject: [PATCH] =?UTF-8?q?[PE]=20=D0=91=D0=B0=D0=B3=20=D1=81=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B5=D0=B2=D1=8C=D1=8E=20=D0=B2=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D0=BD=D0=BE=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=D0=BD=D0=BE=D0=BC=20?= =?UTF-8?q?=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=D0=B5=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D0=BD=D0=B0=D0=BB=D0=B8=D1=87=D0=B8=D0=B8=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D1=85=D0=BE=D0=B4=D0=BE=D0=B2=20=D0=BC=D0=B5=D0=B6=D0=B4?= =?UTF-8?q?=D1=83=20=D1=81=D0=BB=D0=B0=D0=B9=D0=B4=D0=B0=D0=BC=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/app/controller/Statusbar.js | 21 +++++++++------ .../main/app/controller/Toolbar.js | 21 +++++++++------ .../main/app/controller/Viewport.js | 1 + .../main/app/view/DocumentHolder.js | 27 ++++++++++++------- 4 files changed, 45 insertions(+), 25 deletions(-) diff --git a/apps/presentationeditor/main/app/controller/Statusbar.js b/apps/presentationeditor/main/app/controller/Statusbar.js index 008a7060b0..b409cf6f44 100644 --- a/apps/presentationeditor/main/app/controller/Statusbar.js +++ b/apps/presentationeditor/main/app/controller/Statusbar.js @@ -121,18 +121,23 @@ define([ }, onPreview: function(btn, e) { - var previewPanel = PE.getController('Viewport').getView('DocumentPreview'); - if (previewPanel) { + var previewPanel = PE.getController('Viewport').getView('DocumentPreview'), + me = this; + if (previewPanel && me.api) { previewPanel.show(); - if (!this.statusbar.mode.isDesktopApp) - this.fullScreen(document.documentElement); + var onWindowResize = function() { + Common.NotificationCenter.off('window:resize', onWindowResize); - if (this.api) { - var current = this.api.getCurrentPage(); - this.api.StartDemonstration('presentation-preview', _.isNumber(current) ? current : 0); + var current = me.api.getCurrentPage(); + me.api.StartDemonstration('presentation-preview', _.isNumber(current) ? current : 0); Common.component.Analytics.trackEvent('Status Bar', 'Preview'); - } + }; + if (!me.statusbar.mode.isDesktopApp) { + Common.NotificationCenter.on('window:resize', onWindowResize); + me.fullScreen(document.documentElement); + } else + onWindowResize(); } }, diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 0d46913097..0288600aca 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -737,18 +737,23 @@ define([ }, onPreview: function(btn, e) { - var previewPanel = PE.getController('Viewport').getView('DocumentPreview'); - if (previewPanel) { + var previewPanel = PE.getController('Viewport').getView('DocumentPreview'), + me = this; + if (previewPanel && me.api) { previewPanel.show(); - if (!this.toolbar.mode.isDesktopApp) - this.fullScreen(document.documentElement); + var onWindowResize = function() { + Common.NotificationCenter.off('window:resize', onWindowResize); - if (this.api) { - var current = this.api.getCurrentPage(); - this.api.StartDemonstration('presentation-preview', _.isNumber(current) ? current : 0); + var current = me.api.getCurrentPage(); + me.api.StartDemonstration('presentation-preview', _.isNumber(current) ? current : 0); Common.component.Analytics.trackEvent('ToolBar', 'Preview'); - } + }; + if (!me.toolbar.mode.isDesktopApp) { + Common.NotificationCenter.on('window:resize', onWindowResize); + me.fullScreen(document.documentElement); + } else + onWindowResize(); } }, diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js index e746e392ef..fce3c2cf04 100644 --- a/apps/presentationeditor/main/app/controller/Viewport.js +++ b/apps/presentationeditor/main/app/controller/Viewport.js @@ -123,6 +123,7 @@ define([ onWindowResize: function(e) { this.onLayoutChanged('window'); + Common.NotificationCenter.trigger('window:resize'); } }); }); diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index fd292d85c3..b99230efee 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -667,13 +667,17 @@ define([ e.stopPropagation(); if (me.slidesCount>0) { var previewPanel = PE.getController('Viewport').getView('DocumentPreview'); - if (previewPanel && !previewPanel.isVisible()) { + if (previewPanel && !previewPanel.isVisible() && me.api) { previewPanel.show(); - if (!me.mode.isDesktopApp) - me.fullScreen(document.documentElement); - if (me.api) { + var onWindowResize = function() { + Common.NotificationCenter.off('window:resize', onWindowResize); me.api.StartDemonstration('presentation-preview', 0); - } + }; + if (!me.mode.isDesktopApp) { + Common.NotificationCenter.on('window:resize', onWindowResize); + me.fullScreen(document.documentElement); + } else + onWindowResize(); } } }; @@ -924,16 +928,21 @@ define([ caption : me.txtPreview }).on('click', function(item) { var previewPanel = PE.getController('Viewport').getView('DocumentPreview'); - if (previewPanel) { + if (previewPanel && me.api) { previewPanel.show(); - me.fullScreen(document.documentElement); + var onWindowResize = function() { + Common.NotificationCenter.off('window:resize', onWindowResize); - if (me.api) { var current = me.api.getCurrentPage(); me.api.StartDemonstration('presentation-preview', _.isNumber(current) ? current : 0); Common.component.Analytics.trackEvent('DocumentHolder', 'Preview'); - } + }; + if (!me.mode.isDesktopApp) { + Common.NotificationCenter.on('window:resize', onWindowResize); + me.fullScreen(document.documentElement); + } else + onWindowResize(); } });