Split up and move tbconstants.ts

toolbox-team · Jan 31, 2025 · b86e96e · b86e96e
1 parent cd6f98e
commit b86e96e
Show file tree

Hide file tree

Showing 17 changed files with 160 additions and 153 deletions.
diff --git a/extension/data/components/controls/Icon.tsx b/extension/data/components/controls/Icon.tsx
@@ -1,4 +1,4 @@
-import {icons} from '../../tbconstants';
+import {icons} from '../../util/icons';
 import {classes} from '../../util/ui_interop';
 import css from './Icon.module.css';
 

diff --git a/extension/data/modules/comment.js b/extension/data/modules/comment.js
@@ -6,6 +6,7 @@ import * as TBHelpers from '../tbhelpers.js';
 import TBListener from '../tblistener.js';
 import {Module} from '../tbmodule.jsx';
 import * as TBui from '../tbui.js';
+import {icons} from '../util/icons.ts';
 import {purifyObject} from '../util/purify.js';
 
 import {modbarExists} from './modbar.js';
@@ -100,19 +101,19 @@ self.initOldReddit = async function ({hideRemoved, approveComments, spamRemoved,
         if ($('#tb-bottombar').find('#tb-toggle-removed').length) {
             const $tbToggle = $('#tb-bottombar').find('#tb-toggle-removed');
             if (removedCounter === 1) {
-                $tbToggle.html(`<span class="tb-icons tb-icons-align-middle">${TBui.icons.comments}</span>[1]`);
+                $tbToggle.html(`<span class="tb-icons tb-icons-align-middle">${icons.comments}</span>[1]`);
             } else if (removedCounter > 1) {
                 $tbToggle.html(
-                    `<span class="tb-icons tb-icons-align-middle">${TBui.icons.comments}</span>[${removedCounter.toString()}]`,
+                    `<span class="tb-icons tb-icons-align-middle">${icons.comments}</span>[${removedCounter.toString()}]`,
                 );
             }
         } else if (removedCounter === 1) {
             $('#tb-bottombar').find('#tb-toolbarcounters').prepend(
-                `<a id="tb-toggle-removed" title="Toggle hide/view removed comments" href="javascript:void(0)"><span class="tb-icons tb-icons-align-middle">${TBui.icons.comments}</span>[1]</a>`,
+                `<a id="tb-toggle-removed" title="Toggle hide/view removed comments" href="javascript:void(0)"><span class="tb-icons tb-icons-align-middle">${icons.comments}</span>[1]</a>`,
             );
         } else if (removedCounter > 1) {
             $('#tb-bottombar').find('#tb-toolbarcounters').prepend(
-                `<a id="tb-toggle-removed" title="Toggle hide/view removed comments" href="javascript:void(0)"><span class="tb-icons tb-icons-align-middle">${TBui.icons.comments}</span>[${removedCounter.toString()}]</a>`,
+                `<a id="tb-toggle-removed" title="Toggle hide/view removed comments" href="javascript:void(0)"><span class="tb-icons tb-icons-align-middle">${icons.comments}</span>[${removedCounter.toString()}]</a>`,
             );
         }
 
@@ -328,7 +329,7 @@ function init ({
                 addTrigger: true,
                 title: 'View comments for this thread in chronological flat view.',
                 triggerText: 'comment flat view',
-                triggerIcon: TBui.icons.list,
+                triggerIcon: icons.list,
             });
         } else {
             TBui.contextTrigger('tb-flatview-link', {addTrigger: false});

diff --git a/extension/data/modules/config.js b/extension/data/modules/config.js
@@ -7,6 +7,7 @@ import * as TBHelpers from '../tbhelpers.js';
 import {Module} from '../tbmodule.jsx';
 import * as TBui from '../tbui.js';
 import {clearCache} from '../util/cache.ts';
+import {icons} from '../util/icons.ts';
 import {getSettingSync} from '../util/oldLegacyStorageBullshit.ts';
 import {purify, purifyObject} from '../util/purify.js';
 
@@ -260,7 +261,7 @@ const self = new Module({
                     title: 'edit removal reasons',
                     tooltip: 'Edit and add your removal reasons here.',
                     content: `
-                <a href="javascript:;" id="tb-add-removal-reason" class="tb-general-button"><i class="tb-icons">${TBui.icons.addCircle}</i> Add new removal reason</a>
+                <a href="javascript:;" id="tb-add-removal-reason" class="tb-general-button"><i class="tb-icons">${icons.addCircle}</i> Add new removal reason</a>
                 <a href="javascript:;" id="tb-config-help" class="tb-general-button" data-module="rreasons">help</a></br>
                 <span id="tb-add-removal-reason-form" class="tb-removal-reason-field">
                     <input type="text" class="tb-input" name="removal-title" placeholder="removal reason title" /><br/>
@@ -307,7 +308,7 @@ const self = new Module({
                     title: 'edit mod macros',
                     tooltip: 'Edit and add your mod macros here.',
                     content: `
-                <a href="javascript:;" id="tb-add-mod-macro" class="tb-general-button"><i class="tb-icons">${TBui.icons.addCircle}</i> Add new mod macro</a>
+                <a href="javascript:;" id="tb-add-mod-macro" class="tb-general-button"><i class="tb-icons">${icons.addCircle}</i> Add new mod macro</a>
                 <a href="javascript:;" id="tb-config-help" class="tb-general-button" data-module="modmacros">help</a></br>
                 <div id="tb-add-mod-macro-form">
                     <input type="text" class="tb-input" class="macro-title" name="macro-title" placeholder="macro title" /><br>
@@ -422,7 +423,7 @@ const self = new Module({
                 TBui.contextTrigger('tb-config-link', {
                     addTrigger: true,
                     triggerText: `/r/${subreddit} config`,
-                    triggerIcon: TBui.icons.tbSubConfig,
+                    triggerIcon: icons.tbSubConfig,
                     title: `toolbox configuration for /r/${subreddit}`,
                     dataAttributes: {
                         subreddit,
@@ -714,7 +715,7 @@ const self = new Module({
                 <td><input class="key tb-input" name="type-key" placeholder="key (should be unique)" type="text" value="${key}"></td>
                 <td><input class="color" name="type-color" type="color" value="${safeColor}"></td>
                 <td>
-                    <a class="up-usernote-type tb-icons tb-icons-align-middle" href="javascript:;">${TBui.icons.sortUp}</a><a class="down-usernote-type tb-icons tb-icons-align-middle" href="javascript:;">${TBui.icons.sortDown}</a><a class="remove-usernote-type tb-icons tb-icons-negative tb-icons-align-middle" href="javascript:;">${TBui.icons.delete}</a>
+                    <a class="up-usernote-type tb-icons tb-icons-align-middle" href="javascript:;">${icons.sortUp}</a><a class="down-usernote-type tb-icons tb-icons-align-middle" href="javascript:;">${icons.sortDown}</a><a class="remove-usernote-type tb-icons tb-icons-negative tb-icons-align-middle" href="javascript:;">${icons.delete}</a>
                 </td>
                 <td class="usernote-error error"></td>
 		    </tr>
@@ -798,8 +799,8 @@ const self = new Module({
                 const removalReasonTemplate = `
                 <tr class="removal-reason" data-reason="{{i}}" data-subreddit="{{subreddit}}">
                     <td class="removal-reasons-buttons">
-                        <a href="javascript:;" data-reason="{{i}}" data-subreddit="{{subreddit}}" class="edit tb-icons">${TBui.icons.edit}</a> <br>
-                        <a href="javascript:;" data-reason="{{i}}" data-subreddit="{{subreddit}}" class="delete tb-icons tb-icons-negative">${TBui.icons.delete}</a>
+                        <a href="javascript:;" data-reason="{{i}}" data-subreddit="{{subreddit}}" class="edit tb-icons">${icons.edit}</a> <br>
+                        <a href="javascript:;" data-reason="{{i}}" data-subreddit="{{subreddit}}" class="delete tb-icons tb-icons-negative">${icons.delete}</a>
                     </td>
                     <td class="removal-reasons-content" data-reason="{{i}}">
                         <span class="removal-reason-label" data-for="reason-{{subreddit}}-{{i++}}"><span><h3 class="removal-title">{{removalReasonTitle}}</h3>{{label}}</span></span><br>
@@ -858,8 +859,8 @@ const self = new Module({
                 const removalReasonTemplateHTML = `
                 <tr class="removal-reason" data-reason="${index}" data-subreddit="${subreddit}">
                     <td class="removal-reasons-sort-buttons">
-                        <a href="javascript:;" class="tb-sort-up tb-icons">${TBui.icons.sortUp}</a>
-                        <a href="javascript:;" class="tb-sort-down tb-icons">${TBui.icons.sortDown}</a>
+                        <a href="javascript:;" class="tb-sort-up tb-icons">${icons.sortUp}</a>
+                        <a href="javascript:;" class="tb-sort-down tb-icons">${icons.sortDown}</a>
                     </td>
                     <td class="removal-reasons-content">
                         <span class="removal-reason-label">${removalReasonTitle}</span>
@@ -893,8 +894,8 @@ const self = new Module({
                 const modMacroTemplate = `
                 <tr class="mod-macro" data-macro="{{i}}" data-subreddit="{{subreddit}}">
                     <td class="mod-macros-buttons">
-                        <a href="javascript:;" data-macro="{{i}}" data-subreddit="{{subreddit}}" class="edit tb-icons">${TBui.icons.edit}</a> <br>
-                        <a href="javascript:;" data-macro="{{i}}" data-subreddit="{{subreddit}}" class="delete tb-icons tb-icons-negative">${TBui.icons.delete}</a>
+                        <a href="javascript:;" data-macro="{{i}}" data-subreddit="{{subreddit}}" class="edit tb-icons">${icons.edit}</a> <br>
+                        <a href="javascript:;" data-macro="{{i}}" data-subreddit="{{subreddit}}" class="delete tb-icons tb-icons-negative">${icons.delete}</a>
                     </td>
                     <td class="mod-macros-content" data-macro="{{i}}">
                         <span class="mod-macro-label" data-for="macro-{{subreddit}}-{{i}}"><span><h3 class="macro-title">{{modMacroTitle}}</h3>{{label}}</span></span><br>

diff --git a/extension/data/modules/devtools.js b/extension/data/modules/devtools.js
@@ -6,6 +6,7 @@ import {escapeHTML} from '../tbhelpers.js';
 import TBListener from '../tblistener.js';
 import {Module} from '../tbmodule.jsx';
 import * as TBui from '../tbui.js';
+import {icons} from '../util/icons.ts';
 import {purifyObject} from '../util/purify.js';
 
 export default new Module({
@@ -84,7 +85,7 @@ export default new Module({
         TBui.contextTrigger('tb-testCommentUI-link', {
             addTrigger: true,
             triggerText: 'Show ze overlay!',
-            triggerIcon: TBui.icons.overlay,
+            triggerIcon: icons.overlay,
         });
     }
 

diff --git a/extension/data/modules/historybutton.js b/extension/data/modules/historybutton.js
@@ -6,6 +6,7 @@ import * as TBHelpers from '../tbhelpers.js';
 import TBListener from '../tblistener.js';
 import {Module} from '../tbmodule.jsx';
 import * as TBui from '../tbui.js';
+import {icons} from '../util/icons.ts';
 import {purify, purifyObject} from '../util/purify.js';
 import {getSettingAsync} from '../util/settings.ts';
 
@@ -103,7 +104,7 @@ self.runJsAPI = function ({onlyshowInhover}) {
             TBui.contextTrigger('tb-user-history', {
                 addTrigger: true,
                 triggerText: 'user history',
-                triggerIcon: TBui.icons.history,
+                triggerIcon: icons.history,
                 title: `Show history for /u/${user}`,
                 dataAttributes: {
                     author: user,

diff --git a/extension/data/modules/modbar.js b/extension/data/modules/modbar.js
@@ -5,6 +5,7 @@ import * as TBCore from '../tbcore.js';
 import * as TBHelpers from '../tbhelpers.js';
 import TBModule, {Module} from '../tbmodule.jsx';
 import * as TBui from '../tbui.js';
+import {icons} from '../util/icons.ts';
 import {purify} from '../util/purify.js';
 import {getSettingAsync, setSettingAsync} from '../util/settings.ts';
 
@@ -205,8 +206,8 @@ export default new Module({
     );
     const $modBar = $(`
 <div id="tb-bottombar">
-    <a class="tb-bottombar-hide tb-icons" href="javascript:void(0)">${TBui.icons.arrowLeft}</a>
-    <a class="tb-toolbar-new-settings tb-icons" href="javascript:void(0)" title="toolbox settings">${TBui.icons.settings}</a>
+    <a class="tb-bottombar-hide tb-icons" href="javascript:void(0)">${icons.arrowLeft}</a>
+    <a class="tb-toolbar-new-settings tb-icons" href="javascript:void(0)" title="toolbox settings">${icons.settings}</a>
     <label class="tb-first-run">&#060;-- Click for settings</label>
     <span id="tb-bottombar-contentleft">
         <span id="tb-toolbarshortcuts"></span>
@@ -215,13 +216,13 @@ export default new Module({
         <span id="tb-toolbarcounters">
             <a title="no mail" href="${
         TBCore.link('/message/inbox/')
-    }" class="nohavemail tb-icons" id="tb-mail">${TBui.icons.userInbox}</a>
+    }" class="nohavemail tb-icons" id="tb-mail">${icons.userInbox}</a>
             <a href="${TBCore.link('/message/inbox/')}" id="tb-mailCount"></a>
             <a href="${newModmailUrl}" class="nohavemail access-required tb-icons" id="tb-new_modmail" ${
         openMailTab ? 'target="_blank"' : ''
-    }>${TBui.icons.modmail}</a>
+    }>${icons.modmail}</a>
             <a href="${newModmailUrl}" id="tb-new-modmailcount" ${openMailTab ? 'target="_blank"' : ''}></a>
-            <a title="modqueue" href="${modQueueUrl}" id="tb-modqueue" class="tb-icons">${TBui.icons.modqueue}</a>
+            <a title="modqueue" href="${modQueueUrl}" id="tb-modqueue" class="tb-icons">${icons.modqueue}</a>
             <a href="${modQueueUrl}" id="tb-queueCount"></a>
         </span>
     </span>
@@ -291,15 +292,15 @@ export default new Module({
                 : `/r/${unmoderatedSubreddits}/about/unmoderated`,
         );
         $modBar.find('#tb-toolbarcounters').append(`
-<a title="unmoderated" href="${unModQueueUrl}" class="tb-icons" id="tb-unmoderated">${TBui.icons.unmoderated}</a>
+<a title="unmoderated" href="${unModQueueUrl}" class="tb-icons" id="tb-unmoderated">${icons.unmoderated}</a>
 <a href="${unModQueueUrl}" id="tb-unmoderatedCount"></a>
 `);
     }
 
     const $modbarhid = $(`
 <div id="tb-bottombar-hidden" class="${compactHide ? 'tb-bottombar-compact' : ''}">
     <a class="tb-bottombar-unhide tb-icons" href="javascript:void(0)">${
-        compactHide ? TBui.icons.dotMenu : TBui.icons.arrowRight
+        compactHide ? icons.dotMenu : icons.arrowRight
     }</a>
 </div>
 `);
@@ -357,24 +358,24 @@ export default new Module({
                         <td class="tb-my-subreddits-subreddit">
                             <a title="/r/${this.subreddit} modqueue" target="_blank" href="${
                     TBCore.link(`/r/${this.subreddit}/about/modqueue`)
-                }" data-type="modqueue" data-subreddit="${this.subreddit}" class="tb-icons">${TBui.icons.modqueue}</a>
+                }" data-type="modqueue" data-subreddit="${this.subreddit}" class="tb-icons">${icons.modqueue}</a>
                             <a title="/r/${this.subreddit} unmoderated" target="_blank" href="${
                     TBCore.link(`/r/${this.subreddit}/about/unmoderated`)
-                }" data-type="unmoderated" data-subreddit="${this.subreddit}" class="tb-icons">${TBui.icons.unmoderated}</a>
+                }" data-type="unmoderated" data-subreddit="${this.subreddit}" class="tb-icons">${icons.unmoderated}</a>
                             <a title="/r/${this.subreddit} moderation log" target="_blank" href="${
                     TBCore.link(`/r/${this.subreddit}/about/log`)
-                }" data-type="modlog" data-subreddit="${this.subreddit}" class="tb-icons">${TBui.icons.modlog}</a>
+                }" data-type="modlog" data-subreddit="${this.subreddit}" class="tb-icons">${icons.modlog}</a>
                             <a title="/r/${this.subreddit} traffic stats" target="_blank" href="${
                     TBCore.link(`/r/${this.subreddit}/about/traffic`)
-                }" data-type="traffic" data-subreddit="${this.subreddit}" class="tb-icons">${TBui.icons.subTraffic}</a>
+                }" data-type="traffic" data-subreddit="${this.subreddit}" class="tb-icons">${icons.subTraffic}</a>
                             ${
                     usernotesEnabled
-                        ? `<a title="/r/${this.subreddit} usernotes" href="javascript:;" class="tb-un-config-link tb-icons" data-subreddit="${this.subreddit}">${TBui.icons.usernote}</a>`
+                        ? `<a title="/r/${this.subreddit} usernotes" href="javascript:;" class="tb-un-config-link tb-icons" data-subreddit="${this.subreddit}">${icons.usernote}</a>`
                         : ''
                 }
                             ${
                     configEnabled
-                        ? `<a title="/r/${this.subreddit} config" href="javascript:;" class="tb-config-link tb-icons" data-subreddit="${this.subreddit}">${TBui.icons.tbSubConfig}</a>`
+                        ? `<a title="/r/${this.subreddit} config" href="javascript:;" class="tb-config-link tb-icons" data-subreddit="${this.subreddit}">${icons.tbSubConfig}</a>`
                         : ''
                 }
                         </td>
@@ -463,7 +464,7 @@ export default new Module({
                     target="_blank"
                     title="this is a ${TBCore.buildType} build of toolbox. click to copy version information"
                 />
-                    <i class="tb-icons">${TBui.icons.prerelease}</i>
+                    <i class="tb-icons">${icons.prerelease}</i>
                     <span>${TBCore.toolboxVersion}</span>
                 </button>
             `).on('click', () => {
@@ -489,7 +490,7 @@ export default new Module({
     if (debugMode) {
         // Reload button
         $('#tb-bottombar').find('#tb-toolbarcounters').before(
-            `<a href="javascript:;" id="tb-reload-link" class="tb-icons" title="reload toolbox">${TBui.icons.tbReload}</a>`,
+            `<a href="javascript:;" id="tb-reload-link" class="tb-icons" title="reload toolbox">${icons.tbReload}</a>`,
         );
 
         $body.on('click', '#tb-reload-link', () => {

diff --git a/extension/data/modules/personalnotes.js b/extension/data/modules/personalnotes.js
@@ -5,6 +5,7 @@ import * as TBCore from '../tbcore.js';
 import * as TBHelpers from '../tbhelpers.js';
 import {Module} from '../tbmodule.jsx';
 import * as TBui from '../tbui.js';
+import {icons} from '../util/icons.ts';
 
 import {modbarExists} from './modbar.js';
 
@@ -45,7 +46,7 @@ export default new Module({
     const noteListTemplate = `
             <li>
                 <a href="javascript:void(0)" class="tb-personal-note-delete tb-icons tb-icons-negative" data-wiki="{{name}}">
-                    ${TBui.icons.delete}
+                    ${icons.delete}
                 </a>
                 <a href="javascript:void(0)" class="tb-personal-note-link" data-wiki="{{name}}">
                     {{name}}

diff --git a/extension/data/modules/profile.js b/extension/data/modules/profile.js
@@ -6,6 +6,7 @@ import * as TBHelpers from '../tbhelpers.js';
 import TBListener from '../tblistener.js';
 import {Module} from '../tbmodule.jsx';
 import * as TBui from '../tbui.js';
+import {icons} from '../util/icons.ts';
 import {purifyObject} from '../util/purify.js';
 import {getSettingAsync} from '../util/settings.ts';
 
@@ -876,7 +877,7 @@ export default new Module({
             TBui.contextTrigger('tb-user-profile', {
                 addTrigger: true,
                 triggerText: 'toolbox profile',
-                triggerIcon: TBui.icons.profile,
+                triggerIcon: icons.profile,
                 title: `Show toolbox profile for /u/${user}`,
                 dataAttributes: {
                     user,