Remove changung token display name functionality

karpiq24 · Jan 14, 2024 · e73fca7 · e73fca7
1 parent 10c932b
commit e73fca7
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 63 deletions.
diff --git a/scripts/main.js b/scripts/main.js
diff --git a/scripts/main.js.map b/scripts/main.js.map
diff --git a/src/actor.js b/src/actor.js
@@ -1,6 +1,5 @@
 import { playersSeeName, refresh, toggleSeeName } from './api'
 import { MODULE_ID, localize } from './module'
-import { updateActorTokens } from './token'
 
 export function getActorDirectoryEntryContext(html, entries) {
     addSelectContextEntry({
@@ -27,7 +26,6 @@ export function onActorUpdate(actor, data) {
     let needsRefresh = getProperty(data, `flags.${MODULE_ID}.showName}`) !== undefined
 
     if ('ownership' in data) {
-        updateActorTokens(actor, actor.hasPlayerOwner)
         needsRefresh = true
     }
 

diff --git a/src/api.js b/src/api.js
@@ -1,5 +1,4 @@
 import { capitalize, getFlag, getSetting, localize, setFlag } from './module'
-import { updateActorTokens } from './token'
 
 export function playersSeeName(doc) {
     if (doc instanceof Combatant && doc.actor) doc = doc.actor
@@ -16,7 +15,6 @@ export async function toggleSeeName(doc) {
     if (canvas.tokens.hud?.rendered) canvas.tokens.hud.render()
 
     const actor = doc instanceof Actor ? doc : doc.actor
-    if (actor) updateActorTokens(actor, showName)
 
     return showName
 }

diff --git a/src/main.js b/src/main.js
@@ -4,7 +4,7 @@ import { AnonymousNamesMenu } from './apps/names'
 import { renderChatMessage } from './chat'
 import { getCurrentModule, isGM, registerSetting, registerSettingMenu } from './module'
 import { thirdPartyInitHooks, thirdPartyInitialization, thirdPartyReadyHooks } from './third'
-import { preCreateToken, renderTokenHUD } from './token'
+import { renderTokenHUD } from './token'
 import { renderCombatTracker } from './tracker'
 
 Hooks.once('init', () => {
@@ -84,5 +84,4 @@ Hooks.once('ready', () => {
 
 Hooks.on('renderCombatTracker', renderCombatTracker)
 Hooks.on('renderChatMessage', renderChatMessage)
-Hooks.on('preCreateToken', preCreateToken)
 Hooks.on('updateActor', onActorUpdate)
diff --git a/src/token.js b/src/token.js
@@ -1,10 +1,5 @@
 import { playersSeeName, toggleSeeName } from './api'
-import { getActorTokens, getSetting, localize } from './module'
-
-export function updateActorTokens(actor, showName) {
-    if (actor.token) changeDisplayName(actor.token, showName)
-    else getActorTokens(actor, true).forEach(x => changeDisplayName(x, showName))
-}
+import { getActorTokens, localize } from './module'
 
 export function renderTokenHUD(hud, html) {
     const actor = hud.object.actor
@@ -15,13 +10,6 @@ export function renderTokenHUD(hud, html) {
     html.find('.col.right').append(toggle)
 }
 
-export function preCreateToken(token) {
-    if (token.actor?.hasPlayerOwner) return
-    const displayName = token.displayName
-    const swap = swapToHide(displayName)
-    if (swap !== displayName) token._source.displayName = swap
-}
-
 function createToggle(actor) {
     const tmp = document.createElement('template')
     const toggled = playersSeeName(actor)
@@ -32,40 +20,3 @@ function createToggle(actor) {
 
     return tmp.content.firstChild
 }
-
-function changeDisplayName(token, showName) {
-    if (showName) showTokenName(token)
-    else hideTokenName(token)
-}
-
-function showTokenName(token) {
-    const displayName = token.displayName
-    if (isShowing(displayName) || !getSetting('token')) return
-
-    let swap = displayName
-    if (swap === CONST.TOKEN_DISPLAY_MODES.OWNER_HOVER) swap = CONST.TOKEN_DISPLAY_MODES.HOVER
-    else if (swap === CONST.TOKEN_DISPLAY_MODES.OWNER) swap = CONST.TOKEN_DISPLAY_MODES.ALWAYS
-
-    token.update({ displayName: swap })
-}
-
-function hideTokenName(token) {
-    const displayName = token.displayName
-    if (isHidding(displayName)) return
-    const swap = swapToHide(displayName)
-    token.update({ displayName: swap })
-}
-
-function isHidding(displayName) {
-    return !isShowing(displayName)
-}
-
-function isShowing(displayName) {
-    return displayName === CONST.TOKEN_DISPLAY_MODES.HOVER || displayName === CONST.TOKEN_DISPLAY_MODES.ALWAYS
-}
-
-function swapToHide(displayName) {
-    if (displayName === CONST.TOKEN_DISPLAY_MODES.HOVER) return CONST.TOKEN_DISPLAY_MODES.OWNER_HOVER
-    if (displayName === CONST.TOKEN_DISPLAY_MODES.ALWAYS) return CONST.TOKEN_DISPLAY_MODES.OWNER
-    return displayName
-}