From 0f07d8ad55aa588da90fc90097465d49570e0fdb Mon Sep 17 00:00:00 2001 From: Thor Larholm Date: Tue, 10 Sep 2013 21:40:14 +0200 Subject: [PATCH 1/2] Squashed: Added basic support for presentationMode in IE11 --- web/viewer.css | 23 +++++++++++++++++++++++ web/viewer.js | 14 ++++++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/web/viewer.css b/web/viewer.css index 9ad8b34da..5eda98fbd 100644 --- a/web/viewer.css +++ b/web/viewer.css @@ -64,6 +64,21 @@ select { cursor: none; } +#viewerContainer:-ms-fullscreen { + top: 0px !important; + position: absolute; + border-top: 2px solid transparent; + width: 100%; + height: 100%; + overflow: hidden; + cursor: none; +} + +#viewerContainer:-ms-fullscreen::-ms-backdrop { + background-color: #404040; + background-image: url(images/texture.png); +} + #viewerContainer:fullscreen { top: 0px; border-top: 2px solid transparent; @@ -83,6 +98,10 @@ select { margin-bottom: 100%; } +:-ms-fullscreen .page { + margin-bottom: 100%; +} + :fullscreen .page { margin-bottom: 100%; } @@ -95,6 +114,10 @@ select { display: none; } +:-ms-fullscreen a:not(.internalLink) { + display: none; +} + :fullscreen a:not(.internalLink) { display: none; } diff --git a/web/viewer.js b/web/viewer.js index 50edf3534..0d9e6601f 100644 --- a/web/viewer.js +++ b/web/viewer.js @@ -392,11 +392,12 @@ var PDFView = { get supportsFullscreen() { var doc = document.documentElement; var support = doc.requestFullscreen || doc.mozRequestFullScreen || - doc.webkitRequestFullScreen; + doc.webkitRequestFullScreen || doc.msRequestFullscreen; if (document.fullscreenEnabled === false || document.mozFullScreenEnabled === false || - document.webkitFullscreenEnabled === false ) { + document.webkitFullscreenEnabled === false || + document.msFullscreenEnabled === false) { support = false; } @@ -1386,7 +1387,8 @@ var PDFView = { presentationMode: function pdfViewPresentationMode() { var isPresentationMode = document.fullscreenElement || document.mozFullScreen || - document.webkitIsFullScreen; + document.webkitIsFullScreen || + document.msFullscreenElement; if (isPresentationMode) { return false; @@ -1399,6 +1401,8 @@ var PDFView = { wrapper.mozRequestFullScreen(); } else if (document.documentElement.webkitRequestFullScreen) { wrapper.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT); + } else if (document.documentElement.msRequestFullscreen) { + wrapper.msRequestFullscreen(); } else { return false; } @@ -2830,7 +2834,8 @@ window.addEventListener('afterprint', function afterPrint(evt) { function presentationModeChange(e) { var isPresentationMode = document.fullscreenElement || document.mozFullScreen || - document.webkitIsFullScreen; + document.webkitIsFullScreen || + document.msFullscreenElement; if (isPresentationMode) { PDFView.enterPresentationMode(); @@ -2843,6 +2848,7 @@ window.addEventListener('afterprint', function afterPrint(evt) { window.addEventListener('mozfullscreenchange', presentationModeChange, false); window.addEventListener('webkitfullscreenchange', presentationModeChange, false); + window.addEventListener('MSFullscreenChange', presentationModeChange, false); })(); (function animationStartedClosure() { From 3c2d079c4292adc3dd6dff80e82337727367bd19 Mon Sep 17 00:00:00 2001 From: Thor Larholm Date: Tue, 10 Sep 2013 22:17:40 +0200 Subject: [PATCH 2/2] Fixed review notes: Adding specificity and removing redundant declaration --- web/viewer.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/web/viewer.css b/web/viewer.css index 5eda98fbd..53a800fad 100644 --- a/web/viewer.css +++ b/web/viewer.css @@ -66,11 +66,10 @@ select { #viewerContainer:-ms-fullscreen { top: 0px !important; - position: absolute; border-top: 2px solid transparent; width: 100%; height: 100%; - overflow: hidden; + overflow: hidden !important; cursor: none; } @@ -99,7 +98,7 @@ select { } :-ms-fullscreen .page { - margin-bottom: 100%; + margin-bottom: 100% !important; } :fullscreen .page { @@ -115,7 +114,7 @@ select { } :-ms-fullscreen a:not(.internalLink) { - display: none; + display: none !important; } :fullscreen a:not(.internalLink) {