Update to v11

teroparvinen · Jul 10, 2023 · 55e52f2 · 55e52f2
1 parent 66859b8
commit 55e52f2
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 28 deletions.
diff --git a/lang/en.json b/lang/en.json
@@ -2,6 +2,6 @@
     "scene-helpers": {
         "setting-doubleclick": "Double click a scene in the navigation bar",
         "setting-doubleclick-notes": "Open scene notes",
-        "setting-doubleclick-config": "Open scene onfiguration"
+        "setting-doubleclick-config": "Open scene configuration"
     }
 }
diff --git a/module.json b/module.json
@@ -4,13 +4,13 @@
     "description": "Small improvements to scene controls.",
     "authors": [
         {
-            "name": "Tero Parvinen (Whistler#3253)"
+            "name": "Tero Parvinen (tero.p)"
         }
     ],
-    "version": "10.0",
+    "version": "11.0",
     "compatibility": {
-        "minimum": 10,
-        "verified": 10
+        "minimum": 11,
+        "verified": 11
     },
     "relationships": {
         "requires": [

diff --git a/module/scene-helpers.js b/module/scene-helpers.js
@@ -14,36 +14,37 @@ Hooks.on("init", () => {
 });
 
 Hooks.on("setup", () => {
-    libWrapper.register("scene-helpers", "SidebarDirectory.prototype._onClickDocumentName", onClickDocumentName, "MIXED");
+    libWrapper.register("scene-helpers", "SceneDirectory.prototype.activateListeners", onSceneDirectoryListeners, "MIXED");
     libWrapper.register("scene-helpers", "SceneNavigation.prototype._onClickScene", onClickScene, "MIXED");
 });
 
-function onClickDocumentName(wrapped, event) {
-    const element = event.currentTarget;
-    const documentId = element.parentElement.dataset.documentId;
-    const document = this.constructor.collection.get(documentId);
-
-    if (document.documentName == "Scene" && document.testUserPermission(game.user, "LIMITED")) {
-        if ((event.ctrlKey || event.metaKey) && !event.altKey) {
-            document.activate();
-        } else if (!(event.ctrlKey || event.metaKey) && event.altKey) {
-            if (game.user.isGM) {
-                const sheet = document.sheet;
-                if (sheet.rendered) {
-                    sheet.maximize();
-                    sheet.bringToTop();
+function onSceneDirectoryListeners(wrapped, html) {
+    html.find(".document.scene")
+        .click((event) => {
+            const element = event.currentTarget;
+            const documentId = element.dataset.documentId;
+            const document = this.constructor.collection.get(documentId);
+
+            if (document.testUserPermission(game.user, "LIMITED")) {
+                if ((event.ctrlKey || event.metaKey) && !event.altKey) {
+                    document.activate();
+                } else if (!(event.ctrlKey || event.metaKey) && event.altKey) {
+                    if (game.user.isGM) {
+                        const sheet = document.sheet;
+                        if (sheet.rendered) {
+                            sheet.maximize();
+                            sheet.bringToTop();
+                        } else {
+                            sheet.render(true);
+                        }
+                    }
                 } else {
-                    sheet.render(true);
+                    document.view();
                 }
             }
-        } else {
-            document.view();
-        }
+        });
 
-        return true;
-    } else {
-        return wrapped(event);
-    }
+    wrapped(html);
 }
 
 function togglePin(event) {