VERSION 0.8.36

League-of-Foundry-Developers · Jan 30, 2022 · bd3ac29 · bd3ac29
1 parent 494785d
commit bd3ac29
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.8.36
+
+- Rimosso hook `getSceneNavigationContext` becuase is redondant with `canvasReady`
+
 ## 0.8.35
 
 - Add checker for avoid the reload of trigger when update/delete/create journal if they aren't under the trigger happy folder [himmelweiss comment](https://github.com/League-of-Foundry-Developers/fvtt-module-trigger-happy/issues/88)

diff --git a/module.json b/module.json
@@ -2,7 +2,7 @@
   "name": "trigger-happy",
   "title": "Trigger Happy",
   "description": "Automate everything in your world by creating triggers for your players to spring traps or anything you can think of!",
-  "version": "0.8.35",
+  "version": "0.8.36",
   "author": "KaKaRoTo, tposney, p4535992",
   "type": "module",
   "socket": true,
@@ -61,9 +61,9 @@
   ],
   "url": "https://github.com/League-of-Foundry-Developers/fvtt-module-trigger-happy",
   "manifest": "https://github.com/League-of-Foundry-Developers/fvtt-module-trigger-happy/releases/latest/download/module.json",
-  "download": "https://github.com/League-of-Foundry-Developers/fvtt-module-trigger-happy/releases/download/v0.8.35/module.zip",
-  "readme": "https://github.com/League-of-Foundry-Developers/fvtt-module-trigger-happy/blob/v0.8.35/README.md",
-  "changelog": "https://github.com/League-of-Foundry-Developers/fvtt-module-trigger-happy/blob/v0.8.35/changelog.md",
+  "download": "https://github.com/League-of-Foundry-Developers/fvtt-module-trigger-happy/releases/download/v0.8.36/module.zip",
+  "readme": "https://github.com/League-of-Foundry-Developers/fvtt-module-trigger-happy/blob/v0.8.36/README.md",
+  "changelog": "https://github.com/League-of-Foundry-Developers/fvtt-module-trigger-happy/blob/v0.8.36/changelog.md",
   "bugs": "https://github.com/League-of-Foundry-Developers/fvtt-module-trigger-happy/issues",
   "minimumCoreVersion": "0.8.9",
   "compatibleCoreVersion": "9",

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "name": "trigger-happy",
   "title": "Trigger Happy",
   "description": "Automate everything in your world by creating triggers for your players to spring traps or anything you can think of!",
-  "version": "0.8.35",
+  "version": "0.8.36",
   "scripts": {
     "package": "gulp package",
     "build": "gulp clean && gulp build && gulp link",

diff --git a/trigger.js b/trigger.js
@@ -374,9 +374,9 @@ export class TriggerHappy {
       this._parseJournals();
     }); // TODO maybe we don't need this anymore ???
     Hooks.on('preUpdateNote', this._onPreUpdateNote.bind(this));
-    Hooks.on('getSceneNavigationContext', (...args) => {
-      this._parseJournals();
-    }); // parse again the journal when change scene
+    // Hooks.on('getSceneNavigationContext', (...args) => {
+    //   this._parseJournals();
+    // }); // parse again the journal when change scene
 
     this.registeredEffects = [];
     this.triggers = [];
@@ -1397,10 +1397,13 @@ export class TriggerHappy {
   }
 
   async _onCanvasReady(canvas) {
-    const triggers = this.triggers.filter((trigger) => this._isSceneTrigger(canvas.scene, trigger));
-    await this._executeTriggers(triggers);
-    canvas.stage.on('mousedown', (ev) => this._onMouseDown(ev));
-    this._parseJournals();
+    try {
+      const triggers = this.triggers.filter((trigger) => this._isSceneTrigger(canvas.scene, trigger));
+      await this._executeTriggers(triggers);
+      canvas.stage.on('mousedown', (ev) => this._onMouseDown(ev));
+    } finally {
+      this._parseJournals();
+    }
   }
 
   _getMousePosition(event) {