From 1c466b4648bed22f5720561e0da6b8ecc8dd65af Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Fri, 6 Dec 2019 00:20:56 +0100
Subject: [PATCH] Remove the `viewer` option from the `PDFPresentationMode`
 constructor

The `viewer` option was *only* used for checking that a document is loaded in `PDFPresentationMode.request`, however that's just as easy to do by simply utilizing `BaseViewer.pagesCount` instead and this way we can also avoid the DOM lookup.
---
 web/app.js                   | 1 -
 web/pdf_presentation_mode.js | 7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/web/app.js b/web/app.js
index 360db051c3e24..0cc82c4f13688 100644
--- a/web/app.js
+++ b/web/app.js
@@ -368,7 +368,6 @@ let PDFViewerApplication = {
     if (this.supportsFullscreen) {
       this.pdfPresentationMode = new PDFPresentationMode({
         container,
-        viewer,
         pdfViewer: this.pdfViewer,
         eventBus,
         contextMenuItems: appConfig.fullscreen,
diff --git a/web/pdf_presentation_mode.js b/web/pdf_presentation_mode.js
index bea6a3a1333d2..3a9b87ca3f91d 100644
--- a/web/pdf_presentation_mode.js
+++ b/web/pdf_presentation_mode.js
@@ -32,7 +32,6 @@ const SWIPE_ANGLE_THRESHOLD = Math.PI / 6;
 /**
  * @typedef {Object} PDFPresentationModeOptions
  * @property {HTMLDivElement} container - The container for the viewer element.
- * @property {HTMLDivElement} [viewer] - The viewer element.
  * @property {PDFViewer} pdfViewer - The document viewer.
  * @property {EventBus} eventBus - The application event bus.
  * @property {Array} [contextMenuItems] - The menu items that are added to the
@@ -43,10 +42,8 @@ class PDFPresentationMode {
   /**
    * @param {PDFPresentationModeOptions} options
    */
-  constructor({ container, viewer = null, pdfViewer, eventBus,
-                contextMenuItems = null, }) {
+  constructor({ container, pdfViewer, eventBus, contextMenuItems = null, }) {
     this.container = container;
-    this.viewer = viewer || container.firstElementChild;
     this.pdfViewer = pdfViewer;
     this.eventBus = eventBus;
 
@@ -82,7 +79,7 @@ class PDFPresentationMode {
    * @returns {boolean} Indicating if the request was successful.
    */
   request() {
-    if (this.switchInProgress || this.active || !this.viewer.hasChildNodes()) {
+    if (this.switchInProgress || this.active || !this.pdfViewer.pagesCount) {
       return false;
     }
     this._addFullscreenChangeListeners();