Merge pull request #1438 from crnormand/bugfix/nullobject

pull gurpslink function code out of gurps.js
crnormand · May 29, 2022 · 1cf9e6b · 1cf9e6b
2 parents cba49b4 + cdd6051
commit 1cf9e6b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 4 deletions.
diff --git a/lib/moustachewax.js b/lib/moustachewax.js
@@ -18,7 +18,7 @@ import { parseDecimalNumber } from './parse-decimal-number/parse-decimal-number.
 import { MoveModes } from '../module/actor/actor.js'
 import { DamageTables } from '../module/damage/damage-tables.js'
 import { multiplyDice } from '../module/utilities/damage-utils.js'
-import { gurpslink } from '../../../../develop/gurps/module/utilities/gurpslink.js'
+import { gurpslink } from '../module/utilities/gurpslink.js'
 
 /*
   Called Moustache Wax because it helps Handlebars. Get it?

diff --git a/module/actor/effect-modifier-popout.js b/module/actor/effect-modifier-popout.js
@@ -1,6 +1,6 @@
 import GurpsWiring from '../gurps-wiring.js'
 import { i18n, i18n_f } from '../../lib/utilities.js'
-import { gurpslink } from '../../../../../develop/gurps/module/utilities/gurpslink.js'
+import { gurpslink } from '../../module/utilities/gurpslink.js'
 
 export class EffectModifierPopout extends Application {
   constructor(token, callback, options = {}) {

diff --git a/module/chat.js b/module/chat.js
@@ -4,7 +4,7 @@ import * as Settings from '../lib/miscellaneous-settings.js'
 import { i18n } from '../lib/utilities.js'
 import ChatProcessor from './chat/chat-processor.js'
 import GurpsWiring from './gurps-wiring.js'
-import { gurpslink } from '../../../../develop/gurps/module/utilities/gurpslink.js'
+import { gurpslink } from '../module/utilities/gurpslink.js'
 
 /**
  *  This holds functions for all things chat related

diff --git a/module/gurps.js b/module/gurps.js
@@ -69,6 +69,9 @@ import GurpsActiveEffectConfig from './effects/active-effect-config.js'
 import * as GURPSSpeedProvider from './speed-provider.js'
 import { multiplyDice } from './utilities/damage-utils.js'
 import GurpsWiring from './gurps-wiring.js'
+import { gurpslink } from './utilities/gurpslink.js'
+
+let GURPS = undefined
 
 if (!window.GURPS) {
   GURPS = {}
@@ -371,6 +374,9 @@ if (!window.GURPS) {
   }
   GURPS.trim = trim
 
+  // Needed for external modules like Token Action HUD and Nordlond Bestiary
+  GURPS.gurpslink = gurpslink
+
   /**
    * @param {string} string
    * @param {boolean} priv

diff --git a/module/journal.js b/module/journal.js
@@ -1,6 +1,6 @@
 import GurpsWiring from './gurps-wiring.js'
 import { atou } from '../lib/utilities.js'
-import { gurpslink } from '../../../../develop/gurps/module/utilities/gurpslink.js'
+import { gurpslink } from '../module/utilities/gurpslink.js'
 
 export default class GurpsJournalEntry {
   static ready() {

diff --git a/module/utilities/contextmenu.js b/module/utilities/contextmenu.js
@@ -1,3 +1,4 @@
+// Context Menu
 export default class GgaContextMenu extends ContextMenu {
   constructor(container, element, selector, title, menuItems, events = { eventName: 'contextmenu' }) {
     super(element, selector, menuItems, events)

diff --git a/module/utilities/gurpslink.js b/module/utilities/gurpslink.js
@@ -1,3 +1,5 @@
+import { parselink } from '../../lib/parselink.js'
+
 /**
  * Return html for text, parsing GURPS "links" into <span class="gurplink">XXX</span>.
  * @param {string | null | undefined} str