From 5d97434736f0c6c4236d03026ec4f40e4349aa67 Mon Sep 17 00:00:00 2001 From: Yury Delendik Date: Wed, 5 Jun 2013 11:01:09 -0500 Subject: [PATCH] Properly disables presentation mode --- web/viewer.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/web/viewer.js b/web/viewer.js index bbb3371aa..4ec85b5d7 100644 --- a/web/viewer.js +++ b/web/viewer.js @@ -1170,8 +1170,9 @@ var PDFView = { var support = doc.requestFullscreen || doc.mozRequestFullScreen || doc.webkitRequestFullScreen; - // Disable presentation mode button if we're in an iframe - if (window.parent !== window) { + if (document.fullscreenEnabled === false || + document.mozFullScreenEnabled === false || + document.webkitFullscreenEnabled === false ) { support = false; } @@ -2183,7 +2184,10 @@ var PDFView = { } else { return false; } + return true; + }, + enterPresentationMode: function pdfViewEnterPresentationMode() { this.isPresentationMode = true; var currentPage = this.pages[this.page - 1]; this.previousScale = this.currentScaleValue; @@ -2195,7 +2199,6 @@ var PDFView = { }, 0); this.showPresentationControls(); - return true; }, exitPresentationMode: function pdfViewExitPresentationMode() { @@ -4023,7 +4026,9 @@ window.addEventListener('afterprint', function afterPrint(evt) { document.mozFullScreen || document.webkitIsFullScreen; - if (!isPresentationMode) { + if (isPresentationMode) { + PDFView.enterPresentationMode(); + } else { PDFView.exitPresentationMode(); } }