2 files changed, 39 insertions, 67 deletions

diff --git a/beamer/viewer/stage/actions.js b/beamer/viewer/stage/actions.js
index 601a441..818e970 100644
--- a/beamer/viewer/stage/actions.js
+++ b/beamer/viewer/stage/actions.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";
@@ -27,10 +15,7 @@ class ActionEventHandler {
 
 class KeyboardEventHandler extends ActionEventHandler {
   register(window) {
-    const self = this;
-    window.addEventListener("keydown", function(event) {
-      self._onCommand(event);
-    })
+    window.addEventListener("keydown", event => this._onCommand(event));
   }
 
   _onCommand(keyboardEvent) {
@@ -38,10 +23,14 @@ class KeyboardEventHandler extends ActionEventHandler {
       case "Enter":
       case " ":
       case "ArrowRight":
+      case "ArrowDown":
+      case "PageDown":
       case "n":
         return this.onNext();
 
       case "ArrowLeft":
+      case "ArrowUp":
+      case "PageUp":
       case "p":
         return this.onPrevious();
     }
@@ -50,10 +39,7 @@ class KeyboardEventHandler extends ActionEventHandler {
 
 class MouseClickEventHandler extends ActionEventHandler {
   register(window) {
-    const self = this;
-    window.addEventListener("click", function(event) {
-      self._onCommand(event);
-    })
+    window.addEventListener("click", event => this._onCommand(event));
   }
 
   _onCommand(mouseEvent) {
@@ -69,24 +55,22 @@ class TouchSwipeEventHandler extends ActionEventHandler {
   }
 
   register(window) {
-    const self = this;
-
-    window.addEventListener("touchstart", function(event) {
+    window.addEventListener("touchstart", event => {
       event.preventDefault();
-      self._onTouchStart(event);
+      this._onTouchStart(event);
     });
 
-    window.addEventListener("touchmove", function(event) {
+    window.addEventListener("touchmove", event => {
       event.preventDefault();
-      self._onTouchMove(event);
+      this._onTouchMove(event);
     });
 
-    window.addEventListener("touchend", function(event) {
+    window.addEventListener("touchend", event => {
       event.preventDefault();
-      self._onTouchEnd();
+      this._onTouchEnd();
     });
 
-    window.addEventListener("touchcancel", function(event) {
+    window.addEventListener("touchcancel", event => {
       event.preventDefault();
     });
   }
diff --git a/beamer/viewer/stage/stage.js b/beamer/viewer/stage/stage.js
index 201f7b4..763f3b2 100644
--- a/beamer/viewer/stage/stage.js
+++ b/beamer/viewer/stage/stage.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";
@@ -23,23 +11,25 @@ class Stage {
     this.audienceScreen = null;
     this.presenterScreen = null;
 
-    this.projector = window.open(window.location.href, "_blank", "toolbar=0,location=0,menubar=0");
-    if (this.projector == null)
-      alert("Please allow pop-ups, then refresh this page.");
-
-    const self = this;
-    this.projector.addEventListener("load", function() {
-      self.audienceScreen = new Screen(self.projector, false, false);
-      self.presenterScreen = new Screen(window, true, true);
-      self._watchDetach();
-      onReady();
-    });
-
+    this.onReady = onReady;
     this.eventHandlers = [
       new KeyboardEventHandler(onNext, onPrevious),
       new MouseClickEventHandler(onNext, onPrevious),
       new TouchSwipeEventHandler(onNext, onPrevious)
     ];
+  }
+
+  start() {
+    this.projector = window.open(window.location.href, "_blank", "toolbar=0,location=0,menubar=0");
+    if (this.projector == null)
+      alert("Please allow pop-ups, then refresh this page.");
+
+    this.projector.addEventListener("load", () => {
+      this.audienceScreen = new Screen(this.projector, false, false);
+      this.presenterScreen = new Screen(window, true, true);
+      this._watchDetach();
+      this.onReady();
+    });
 
     this._registerEventHandler(window);
     this._registerEventHandler(this.projector);
@@ -53,20 +43,18 @@ class Stage {
   _registerEventHandler(window) {
     if (window == null) return;
 
-    this.eventHandlers.forEach(function(eventHandler) {
-      eventHandler.register(window);
-    });
+    this.eventHandlers
+      .forEach(eventHandler => eventHandler.register(window));
   }
 
   _watchDetach() {
-    const self = this;
-    window.addEventListener("beforeunload", function() {
-      self._setMessage(self.projector, "Controller detached");
-    });
+    window.addEventListener("beforeunload", () =>
+      this._setMessage(this.projector, "Controller detached")
+    );
 
-    this.projector.addEventListener("beforeunload", function() {
-      self._setMessage(window, "Viewer detached");
-    });
+    this.projector.addEventListener("beforeunload", () =>
+      this._setMessage(window, "Viewer detached")
+    );
   }
 
   _setMessage(window, message) {