chore: swap to :preload event

feildmaster · feildmaster · commit fd6d80b8eba5 · 2025-03-12T00:30:21.000-05:00
diff --git a/src/base/friends/delete.js b/src/base/friends/delete.js
@@ -49,7 +49,7 @@ function process(btn) {
   }).catch(captureError);
 }
 
-eventManager.on(':loaded:Friends', () => {
+eventManager.on(':preload:Friends', () => {
   style.add('.deleted { text-decoration: line-through; }');
   $('a[href^="Friends?"]').click(remove);
   globalSet('updateFriends', function updateFriends() {
diff --git a/src/base/friends/online.js b/src/base/friends/online.js
@@ -17,7 +17,7 @@ export default function updateTip() {
   // eslint-disable-next-line no-underscore-dangle
   target._tippy.popper.querySelector('.onlineFriends').innerHTML = global('selfFriends').filter(({ online }) => online).map((user) => name(user)).join('<br>') || 'None';
 }
-eventManager.on(':loaded', () => {
+eventManager.on(':preload', () => {
   const px = 12;
   style.add(
     '.tippy-tooltip.undercards-theme { background-color: rgba(0,0,0,0.9); font-size: 13px; border: 1px solid #fff; }',
diff --git a/src/base/friendship/collect.js b/src/base/friendship/collect.js
@@ -106,7 +106,7 @@ eventManager.on('Friendship:loaded', () => {
   setupButton(setting.value());
 });
 
-eventManager.on(':loaded:Friendship', () => {
+eventManager.on(':preload:Friendship', () => {
   button = $('<button class="btn btn-info">Collect All</button>');
   setting.on(setupButton);
   button.on('click.script', collect);
diff --git a/src/base/friendship/ranking.js b/src/base/friendship/ranking.js
@@ -132,7 +132,7 @@ function displayRank(card, rank) {
 // TODO: This needs to be hooked into leaderboard
 // eventManager.on('updateFriendship', (data) => updateCache({ ...data, save: true }));
 
-eventManager.on(':loaded:Friendship', () => {
+eventManager.on(':preload:Friendship', () => {
   style.add(
     `.rank {
       position: relative;
diff --git a/src/base/game/emotes.js b/src/base/game/emotes.js
@@ -28,7 +28,7 @@ const enemy = settings.register({
   category: 'Emotes',
 });
 
-compound('GameStart', ':loaded', () => {
+compound('GameStart', ':preload', () => {
   self = global('selfId', { throws: false });
   // live = true;
   if (disableSpectating()) {
diff --git a/src/base/game/screenshake.js b/src/base/game/screenshake.js
@@ -11,7 +11,7 @@ const setting = settings.register({
   page: 'Game',
 });
 
-compound('GameStart', ':loaded', function rumble() {
+compound('GameStart', ':preload', function rumble() {
   const spectating = onPage('Spectate');
   globalSet('shakeScreen', function shakeScreen(...args) {
     if (!disabled()) this.super(...args);
diff --git a/src/base/home/newContent.js b/src/base/home/newContent.js
@@ -41,7 +41,7 @@ const card = settings.register({
   category: 'Home',
 });
 
-eventManager.on(':loaded:', function toasts() {
+eventManager.on(':preload:', function toasts() {
   if (bundle.value()) toast('bundle');
   if (skin.value()) toast('skins');
   if (emotes.value()) toast('emotes');
diff --git a/src/base/hub/missingImport.js b/src/base/hub/missingImport.js
@@ -72,4 +72,4 @@ function toObject(cards = []) {
   }, {});
 }
 
-eventManager.on(':loaded:Hub', init);
+eventManager.on(':preload:Hub', init);
diff --git a/src/base/lastpass.js b/src/base/lastpass.js
@@ -1,7 +1,7 @@
 import eventManager from '../utils/eventManager.js';
 import onPage from '../utils/onPage.js';
 
-eventManager.on(':loaded', () => {
+eventManager.on(':preload', () => {
   if (onPage('Settings') || onPage('SignUp') || onPage('SignIn')) return;
   const type = 'input[type="text"]';
   [...document.querySelectorAll(type)].forEach((el) => {
diff --git a/src/base/leaderboard/goto.js b/src/base/leaderboard/goto.js
@@ -41,15 +41,15 @@ if (onPage('leaderboard')) {
   window.addEventListener('popstate', () => {
     if (!history.state) return;
     if (document.readyState === 'complete') load(history.state);
-    else eventManager.on(':loaded', () => debug('!!!pop unready'), load(history.state));
+    else eventManager.on(':preload', () => debug('!!!pop unready'), load(history.state));
   });
 
   eventManager.on('Rankings:selectPage', () => {
     replacePage = false;
   });
   eventManager.on('Rankings:init', () => load(data));
 
-  eventManager.on(':loaded', () => {
+  eventManager.on(':preload', () => {
     eventManager.on('ShowPage', function showPage(page) {
       if (skip.get()) return;
       set('page', page, replacePage);
diff --git a/src/base/leaderboard/notFound.js b/src/base/leaderboard/notFound.js
@@ -3,7 +3,7 @@ import { globalSet } from '../../utils/global.js';
 import { toast } from '../../utils/2.toasts.js';
 
 const toasts = {};
-eventManager.on(':loaded:leaderboard', () => {
+eventManager.on(':preload:leaderboard', () => {
   globalSet('findUserRow', function findUserRow(user) {
     const row = this.super(user);
     if (row === -1) {
diff --git a/src/base/library/craft/protection.js b/src/base/library/craft/protection.js
@@ -19,7 +19,7 @@ function override(...args) {
   this.super(...args);
 }
 
-eventManager.on(':loaded:Crafting', () => {
+eventManager.on(':preload:Crafting', () => {
   globalSet('auto', override);
   globalSet('craft', override);
   globalSet('disenchant', override);
diff --git a/src/base/library/craft/style.js b/src/base/library/craft/style.js
@@ -1,6 +1,6 @@
 import eventManager from '../../../utils/eventManager.js';
 
-eventManager.on(':loaded:Decks', () => {
+eventManager.on(':preload:Decks', () => {
   const collection = $('#collection');
   collection.css({
     width: '717px',
diff --git a/src/base/library/deck/average.js b/src/base/library/deck/average.js
@@ -12,7 +12,7 @@ const setting = settings.register({
 });
 
 // Calculate average
-eventManager.on(':loaded:Decks', () => {
+eventManager.on(':preload:Decks', () => {
   if (setting.value()) return;
   const avg = $('<span>').hover(hover.show('Average gold cost'));
   $('#soulInfo span').after('<span>Passive</span> ', avg).remove();
diff --git a/src/base/library/deck/deckCode.js b/src/base/library/deck/deckCode.js
@@ -2,7 +2,7 @@ import eventManager from '../../../utils/eventManager.js';
 import { global, globalSet } from '../../../utils/global.js';
 
 // TODO: Remove this when fixed
-eventManager.on(':loaded:Decks', () => {
+eventManager.on(':preload:Decks', () => {
   globalSet('ajaxUrl', 'DecksConfig');
 });
 
diff --git a/src/base/library/deck/import.shiny.js b/src/base/library/deck/import.shiny.js
@@ -17,6 +17,6 @@ function override(idCard, list = []) {
   return this.super(idCard, list);
 }
 
-eventManager.on(':loaded:Decks', () => {
+eventManager.on(':preload:Decks', () => {
   globalSet('getCardInList', override);
 });
diff --git a/src/base/library/deck/random.js b/src/base/library/deck/random.js
@@ -83,7 +83,7 @@ function fillDeck(e) {
   });
 }
 
-eventManager.on(':loaded:Decks', () => {
+eventManager.on(':preload:Decks', () => {
   style.add('.btn { padding: 5px 6px; }');
   const button = $('<button>');
   const inner = $('<span>');
diff --git a/src/base/library/filter.js b/src/base/library/filter.js
@@ -106,7 +106,7 @@ function applyLook(refresh = decks || crafting) {
   }
 }
 
-eventManager.on(':loaded:Decks :loaded:Crafting', () => {
+eventManager.on(':preload:Decks :preload:Crafting', () => {
   // Update filter visuals
   applyLook(false);
   globalSet('isRemoved', function newFilter(card) {
diff --git a/src/base/library/hideCheckboxes.js b/src/base/library/hideCheckboxes.js
@@ -36,4 +36,4 @@ function refresh() {
   }
 }
 
-eventManager.on(':loaded:Decks :loaded:Crafting', refresh);
+eventManager.on(':preload:Decks :preload:Crafting', refresh);
diff --git a/src/base/library/scrollwheel.js b/src/base/library/scrollwheel.js
@@ -10,7 +10,7 @@ const setting = settings.register({
   page: 'Library',
 });
 
-eventManager.on(':loaded:Decks :loaded:Crafting', function scrollwheelLoaded() {
+eventManager.on(':preload:Decks :preload:Crafting', function scrollwheelLoaded() {
   globalSet('onload', function onload() {
     this.super && this.super();
     if (setting.value()) $('#collection').off('mousewheel DOMMouseScroll');
diff --git a/src/base/lobby/noMinigame.js b/src/base/lobby/noMinigame.js
@@ -11,6 +11,6 @@ const setting = settings.register({
   category: 'Minigames',
 });
 
-compound(':loaded:Play', 'pre:getJoinedQueue', () => {
+compound(':preload:Play', 'pre:getJoinedQueue', () => {
   if (setting.value() && global('miniGameLoaded')) globalSet('miniGameLoaded', false);
 });
diff --git a/src/base/quests/completed.js b/src/base/quests/completed.js
@@ -20,7 +20,7 @@ wrap(() => {
     }
   }
 
-  eventManager.on(':loaded:Quests', collectQuests);
+  eventManager.on(':preload:Quests', collectQuests);
   // style.add('progress::before { content: attr(value) " / " attr(max); float: right; color: white; }');
 
   function getBlock() {
diff --git a/src/base/quests/remainingTime.js b/src/base/quests/remainingTime.js
@@ -2,7 +2,7 @@ import luxon from 'luxon';
 import eventManager from '../../utils/eventManager.js';
 import style from '../../utils/style.js';
 
-eventManager.on(':loaded:Quests', () => {
+eventManager.on(':preload:Quests', () => {
   style.add('.dailyMissed { background: repeating-linear-gradient(45deg, red, black 0.488em); }');
 
   const date = luxon.DateTime.now();
diff --git a/src/base/settings/avatar.random.js b/src/base/settings/avatar.random.js
@@ -7,7 +7,7 @@ wrap(() => {
     $('input[name="changeAvatar"]').random().click();
   }
 
-  eventManager.on(':loaded:Avatars', () => {
+  eventManager.on(':preload:Avatars', () => {
     $('.avatarsList').prepend(buildButton());
     $('.avatarsList button').click(random);
   });
diff --git a/src/base/store/buyPacks.js b/src/base/store/buyPacks.js
@@ -42,7 +42,7 @@ wrap(() => {
     return 1;
   }
 
-  eventManager.on(':loaded:Packs', () => {
+  eventManager.on(':preload:Packs', () => {
     const types = ['', 'DR', 'UTY'];
 
     types.forEach((type) => {
diff --git a/src/base/store/cosmetics.confirm.js b/src/base/store/cosmetics.confirm.js
@@ -4,7 +4,7 @@ import * as hover from '../../utils/hover.js';
 import wrap from '../../utils/2.pokemon.js';
 
 wrap(() => {
-  eventManager.on(':loaded:CosmeticsShop', () => {
+  eventManager.on(':preload:CosmeticsShop', () => {
     $('form[action=CosmeticsShop] button')
       .hover(hover.show('Shift: Bypass confirmation'), hover.hide)
       .click(function click(e) {
diff --git a/src/base/streamer/0.streamer.js b/src/base/streamer/0.streamer.js
@@ -32,7 +32,7 @@ menu.addButton({
   hidden: () => mode.value() === disabled,
   action: () => update(!streaming()),
 });
-eventManager.on(':loaded', alert);
+eventManager.on(':preload', alert);
 
 function alert() {
   if (!streaming() || mode.value() === silent) return;
diff --git a/src/base/streamer/email.js b/src/base/streamer/email.js
@@ -2,7 +2,7 @@ import eventManager from '../../utils/eventManager.js';
 import streaming from './0.streamer.js';
 import * as $el from '../../utils/elementHelper.js';
 
-eventManager.on(':loaded:Settings', () => {
+eventManager.on(':preload:Settings', () => {
   if (!streaming()) return;
   $el.text.contains(document.querySelectorAll('p'), 'Mail :').forEach((e) => {
     e.innerText = 'Mail : <hidden>';
diff --git a/src/base/styles/material.inject.js b/src/base/styles/material.inject.js
@@ -1,6 +1,6 @@
 import eventManager from '../../utils/eventManager.js';
 
-eventManager.on(':loaded', () => {
+eventManager.on(':preload', () => {
   const el = document.createElement('link');
   el.href = 'https://fonts.googleapis.com/icon?family=Material+Icons';
   el.rel = 'stylesheet';
diff --git a/src/base/translate/preview.js b/src/base/translate/preview.js
@@ -2,7 +2,7 @@ import eventManager from '../../utils/eventManager.js';
 import { global, globalSet } from '../../utils/global.js';
 import toLocale from '../../utils/toLocale.js';
 
-eventManager.on(':loaded:Translate', () => {
+eventManager.on(':preload:Translate', () => {
   loadLanguages();
 
   globalSet('createTranslator', newTranslator);
diff --git a/src/base/vanilla/aprilFools.js b/src/base/vanilla/aprilFools.js
@@ -10,5 +10,5 @@ const setting = settings.register({
   refresh: true,
 });
 if (setting.value()) {
-  eventManager.on(':loaded', () => globalSet('fish', false, { throws: false }));
+  eventManager.on(':preload', () => globalSet('fish', false, { throws: false }));
 }
diff --git a/src/base/vanilla/card.append.js b/src/base/vanilla/card.append.js
@@ -34,7 +34,7 @@ internal.on('set', (e = PREFIX) => {
   }
 });
 
-eventManager.on(':loaded', () => {
+eventManager.on(':preload', () => {
   const set = globalSet(PREFIX, function appendCard(card, container) {
     internal.emit('pre', card);
     const element = this.super(card, container);
diff --git a/src/base/vanilla/card.text.outline.js b/src/base/vanilla/card.text.outline.js
@@ -15,6 +15,7 @@ const art = VarStore();
 
 function toggle(add = setting.value()) {
   if (art.isSet()) {
+    if (add) return;
     art.get().remove();
   }
   if (add) {
@@ -24,4 +25,4 @@ function toggle(add = setting.value()) {
   }
 }
 
-eventManager.on(':loaded', toggle);
+eventManager.on(':preload', toggle);
diff --git a/src/base/vanilla/card.tribe.outline.js b/src/base/vanilla/card.tribe.outline.js
@@ -15,6 +15,7 @@ const art = VarStore();
 
 function toggle(add = setting.value()) {
   if (art.isSet()) {
+    if (add) return;
     art.get().remove();
   }
   if (add) {
@@ -24,4 +25,4 @@ function toggle(add = setting.value()) {
   }
 }
 
-eventManager.on(':loaded', toggle);
+eventManager.on(':preload', toggle);
diff --git a/src/base/vanilla/cardBaseArt.js b/src/base/vanilla/cardBaseArt.js
@@ -19,7 +19,7 @@ function createCard(card) {
   return this.super(card);
 }
 
-eventManager.on(':loaded', () => {
+eventManager.on(':preload', () => {
   if (!window.createCard) return;
   globalSet('createCard', createCard);
 });
diff --git a/src/base/vanilla/cardBreakingArt.js b/src/base/vanilla/cardBreakingArt.js
@@ -39,6 +39,6 @@ function update(value) {
   ));
 }
 
-eventManager.on(':loaded', () => {
+eventManager.on(':preload', () => {
   update(setting.value());
 });
diff --git a/src/base/vanilla/cardFullArt.js b/src/base/vanilla/cardFullArt.js
@@ -22,6 +22,6 @@ function toggle() {
   }
 }
 
-eventManager.on(':loaded', () => {
+eventManager.on(':preload', () => {
   if (setting.value()) toggle();
 });
diff --git a/src/base/vanilla/cardHover.js b/src/base/vanilla/cardHover.js
@@ -8,7 +8,7 @@ function wrapper(...rest) {
   });
 }
 
-eventManager.on(':loaded', () => {
+eventManager.on(':preload', () => {
   const options = {
     throws: false,
   };
diff --git a/src/base/vanilla/cardName.js b/src/base/vanilla/cardName.js
@@ -22,7 +22,7 @@ function toEnglish(id, ...data) {
   return toLocale({ id, data });
 }
 
-eventManager.on(':loaded', () => {
+eventManager.on(':preload', () => {
   if (!window.createCard || !$.i18n) return;
   globalSet('createCard', createCard);
 });
diff --git a/src/base/vanilla/header.sticky.js b/src/base/vanilla/header.sticky.js
@@ -15,7 +15,7 @@ const setting = settings.register({
   },
 });
 
-eventManager.on(':loaded', () => {
+eventManager.on(':preload', () => {
   toggle(!setting.value());
 });
 
diff --git a/src/base/vanilla/iconHelper.js b/src/base/vanilla/iconHelper.js
@@ -15,7 +15,7 @@ const icons = {
   'finalPack.gif': 'Final Pack<hr>Contains: <ul><li>Rare x1</li><li>Epic x1</li><li>Legendary x1</li><li>Determination x1</li></ul>',
 };
 
-eventManager.on(':loaded', () => {
+eventManager.on(':preload', () => {
   each(icons, (text, type) => {
     makeTip(`img[src="images/icons/${type}${!~type.indexOf('.') ? '.png' : ''}"]`, text);
   });
diff --git a/src/base/vanilla/pageSelect.js b/src/base/vanilla/pageSelect.js
@@ -38,7 +38,7 @@ export default function changePage(page) {
   $('#btnPrevious').prop('disabled', page === 0);
 }
 
-eventManager.on(':loaded', () => {
+eventManager.on(':preload', () => {
   globalSet('showPage', function showPage(page) {
     if (!eventManager.cancelable.emit('preShowPage', page).canceled) {
       this.super(page);
diff --git a/src/base/vanilla/pageShortcuts.js b/src/base/vanilla/pageShortcuts.js
@@ -34,7 +34,7 @@ function setPage(page, max = global('getMaxPage')()) {
   $('#btnPrevious').prop('disabled', page === 0);
 }
 
-eventManager.on(':loaded', () => {
+eventManager.on(':preload', () => {
   if (!global('getMaxPage', { throws: false })) return;
   $('#btnNext').on('click.script', lastPage).hover(hover.show('CTRL Click: Go to last page'));
   $('#btnPrevious').on('click.script', firstPage).hover(hover.show('CTRL Click: Go to first page'));
diff --git a/src/base/vanilla/quest.highlight.js b/src/base/vanilla/quest.highlight.js
diff --git a/src/base/vanilla/reloadCards.js b/src/base/vanilla/reloadCards.js
diff --git a/src/hooks/BootstrapDialog.js b/src/hooks/BootstrapDialog.js
diff --git a/src/hooks/allCardsReady.js b/src/hooks/allCardsReady.js
diff --git a/src/hooks/chat.js b/src/hooks/chat.js
diff --git a/src/hooks/chat.private.history.js b/src/hooks/chat.private.history.js
diff --git a/src/hooks/craft.card.js b/src/hooks/craft.card.js
diff --git a/src/hooks/custom.js b/src/hooks/custom.js
diff --git a/src/hooks/friendship.js b/src/hooks/friendship.js
diff --git a/src/hooks/game.js b/src/hooks/game.js
diff --git a/src/hooks/hotkeys.hotkey.js b/src/hooks/hotkeys.hotkey.js
diff --git a/src/hooks/leaderboard.js b/src/hooks/leaderboard.js
diff --git a/src/hooks/play.js b/src/hooks/play.js
diff --git a/src/hooks/spectate.js b/src/hooks/spectate.js
diff --git a/src/hooks/translation.loaded.js b/src/hooks/translation.loaded.js
diff --git a/src/hooks/unload.js b/src/hooks/unload.js
diff --git a/src/hooks/z-jQuery.js b/src/hooks/z-jQuery.js
diff --git a/src/utils/menubuttons.js b/src/utils/menubuttons.js
diff --git a/src/utils/style.js b/src/utils/style.js

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ function process(btn) {`
`49`	`49`	`}).catch(captureError);`
`50`	`50`	`}`
`51`	`51`
`52`		`-eventManager.on(':loaded:Friends', () => {`
	`52`	`+eventManager.on(':preload:Friends', () => {`
`53`	`53`	`style.add('.deleted { text-decoration: line-through; }');`
`54`	`54`	`$('a[href^="Friends?"]').click(remove);`
`55`	`55`	`globalSet('updateFriends', function updateFriends() {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export default function updateTip() {`
`17`	`17`	`// eslint-disable-next-line no-underscore-dangle`
`18`	`18`	`target._tippy.popper.querySelector('.onlineFriends').innerHTML = global('selfFriends').filter(({ online }) => online).map((user) => name(user)).join('<br>') \|\| 'None';`
`19`	`19`	`}`
`20`		`-eventManager.on(':loaded', () => {`
	`20`	`+eventManager.on(':preload', () => {`
`21`	`21`	`const px = 12;`
`22`	`22`	`style.add(`
`23`	`23`	`'.tippy-tooltip.undercards-theme { background-color: rgba(0,0,0,0.9); font-size: 13px; border: 1px solid #fff; }',`
Original file line number	Diff line number	Diff line change
`@@ -72,4 +72,4 @@ function toObject(cards = []) {`
`72`	`72`	`}, {});`
`73`	`73`	`}`
`74`	`74`
`75`		`-eventManager.on(':loaded:Hub', init);`
	`75`	`+eventManager.on(':preload:Hub', init);`