cleanup showJournal function

moo-man · Dec 6, 2023 · 614de15 · 614de15
1 parent 5db505e
commit 614de15
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/scripts/common/overrides.js b/scripts/common/overrides.js
@@ -1,11 +1,5 @@
 export default function() {
 
-
-  JournalEntryPage.prototype.showInJournal = function() {
-    let journal = this.parent;
-    journal.sheet.goToPage(this.id)
-  }
-
 
   // Convert functions that move data between world and compendium to retain ID
   Actors.prototype.fromCompendium = keepID(Actors.prototype.fromCompendium);

diff --git a/scripts/item/item.js b/scripts/item/item.js
@@ -536,18 +536,15 @@ export class WrathAndGloryItem extends Item {
             return []
     }
 
-    get Journal() {
-        return fromUuid(this.journal)
-    }
-
     async showInJournal() {
-        let journal = await this.Journal
-
-        if (journal instanceof JournalEntry)
-            return journal.sheet.render(true)
-        else if (journal instanceof JournalEntryPage) 
-            return journal.showInJournal()
-
+        let journal = await fromUuid(this.journal)
+        let page;
+        if (journal instanceof JournalEntryPage)
+        {
+            page = journal;
+            journal = journal.parent;
+        }
+        journal.sheet.render(true, {pageId : page?.id})
     }
 
     get AbilityType() {