8 files changed, 186 insertions, 233 deletions

diff --git a/beamer/viewer/init.js b/beamer/viewer/init.js
index 9192834..c8b1ccf 100644
--- a/beamer/viewer/init.js
+++ b/beamer/viewer/init.js
@@ -1,32 +1,11 @@
 /*
  * Beamer Viewer, a web-based PDF presentation viewer
- * Copyright (C) 2018 Pacien TRAN-GIRARD
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * Copyright 2018-2024 Pacien TRAN-GIRARD
+ * SPDX-License-Identifier: EUPL-1.2
  */
 
 "use strict";
 
-const params = function() {
-  const queryDict = {};
-  location.hash.substr(1).split("&").forEach(item => {
-    const pair = item.split("=");
-    queryDict[pair[0]] = pair[1];
-  });
-  return queryDict;
-}();
-
 function isController() {
   return window.opener == null || window.opener.location.href != window.location.href;
 }
@@ -39,28 +18,9 @@ function initCache() {
   offlineCapableIndicator.style.visibility = "visible";
 }
 
-function checkPopupPermission() {
-  const popup = window.open("popup.html");
-
-  if (popup == null) {
-    const warningMessage = document.getElementById("warning");
-    warningMessage.textContent = "A pop-up blocker is active. Make sure to allow pop-ups on this website.";
-  }
-}
-
 function init() {
   initCache();
-  checkPopupPermission();
-
   const viewer = new Viewer();
-
-  if ("file" in params)
-    viewer.load(params["file"]);
-}
-
-function load(file) {
-  location.hash = "file=" + file;
-  location.reload();
 }
 
 if (isController())
diff --git a/beamer/viewer/presentation.js b/beamer/viewer/presentation.js
index 222a6d4..f7f47b2 100644
--- a/beamer/viewer/presentation.js
+++ b/beamer/viewer/presentation.js
@@ -1,19 +1,7 @@
 /*
  * Beamer Viewer, a web-based PDF presentation viewer
- * Copyright (C) 2018 Pacien TRAN-GIRARD
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * Copyright 2018-2024 Pacien TRAN-GIRARD
+ * SPDX-License-Identifier: EUPL-1.2
  */
 
 "use strict";
@@ -25,12 +13,16 @@ class Presentation {
     this.stage = this._setupStage();
   }
 
+  start() {
+    this.stage.start();
+  }
+
   _setupStage() {
-    const self = this;
-    const onStageReadyCallback = function() { self._onStageReady(); };
-    const onNextCallback = function() { self._onNext(); };
-    const onPreviousCallback = function() { self._onPrevious(); };
-    return new Stage(onStageReadyCallback, onNextCallback, onPreviousCallback);
+    return new Stage(
+      () => this._onStageReady(),
+      () => this._onNext(),
+      () => this._onPrevious(),
+    );
   }
 
   _onStageReady() {
@@ -48,10 +40,9 @@ class Presentation {
   }
 
   _setPage(pageIndex) {
-    const self = this;
     this.currentPageIndex = pageIndex;
-    this.pdf.getPage(this.currentPageIndex).then(function(page) {
-      self.stage.setPage(page);
-    })
+    this.pdf
+      .getPage(this.currentPageIndex)
+      .then(page => this.stage.setPage(page))
   }
 }
diff --git a/beamer/viewer/screen/screen.js b/beamer/viewer/screen/screen.js
index c65ebc3..4bebab4 100644
--- a/beamer/viewer/screen/screen.js
+++ b/beamer/viewer/screen/screen.js
@@ -1,19 +1,7 @@
 /*
  * Beamer Viewer, a web-based PDF presentation viewer
- * Copyright (C) 2018 Pacien TRAN-GIRARD
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * Copyright 2018-2024 Pacien TRAN-GIRARD
+ * SPDX-License-Identifier: EUPL-1.2
  */
 
 "use strict";
@@ -42,10 +30,7 @@ class Screen {
   }
 
   _registerListeners() {
-    const self = this;
-    this.window.addEventListener("resize", function() {
-      self._repaint();
-    });
+    this.window.addEventListener("resize", () => this._repaint());
   }
 
   _hideWelcomeScreen() {
@@ -62,9 +47,32 @@ class Screen {
     };
   }
 
+  _getScreenOffsets(secondary, width, height) {
+    if (!secondary) return { xOffset: 0, yOffset: 0 };
+
+    const viewport = this.page.getViewport(1);
+    if (viewport.width > viewport.height)
+      return { xOffset: -width, yOffset: 0 };
+    else
+      return { xOffset: 0, yOffset: -height };
+  }
+
   _getSlideSizeRatio() {
     const viewport = this.page.getViewport(1);
-    return (viewport.width / 2) / viewport.height;
+
+    if (viewport.width > viewport.height)
+      return (viewport.width / 2) / viewport.height;
+    else
+      return viewport.width / (viewport.height / 2);
+  }
+
+  _getScaleFactor(width, height) {
+    const viewport = this.page.getViewport(1);
+
+    if (viewport.width > viewport.height)
+      return height / viewport.height;
+    else
+      return width / viewport.width;
   }
 
   _newCanvas(width, height, xOffset, yOffset) {
@@ -91,10 +99,9 @@ class Screen {
       viewport: this.page.getViewport(scaleFactor)
     };
 
-    const self = this;
-    this.page.render(renderContext).then(function() {
-      self._showCanvas(canvas);
-    });
+    this.page
+      .render(renderContext)
+      .then(() => this._showCanvas(canvas));
   }
 
   _repaint() {
@@ -102,9 +109,11 @@ class Screen {