fix: Use eventManager for everything

feildmaster · feildmaster · commit b2ebbef4f928 · 2018-12-30T17:04:24.000-06:00
diff --git a/src/base/deck.average.js b/src/base/deck.average.js
@@ -24,7 +24,6 @@ onPage('Decks', () => {
       avg.text(`(${round(list.length ? val / list.length : val)})`);
     }
 
-    window.addEventListener('load', count);
-    eventManager.on('Deck:Soul Deck:Change', count);
+    eventManager.on('Deck:Soul Deck:Change load', count);
   });
 });
diff --git a/src/base/deckPreview.js b/src/base/deckPreview.js
@@ -16,7 +16,7 @@ onPage('Decks', function () {
     return hover.show(card);
   }
   // Initial load
-  window.addEventListener('load', () => {
+  eventManager.on('jQuery', () => {
     function checkHover(el) {
       const hover = hoverCard(el);
       return (e) => {
diff --git a/src/base/deckScroll.js b/src/base/deckScroll.js
@@ -7,7 +7,7 @@ settings.register({
 onPage('Decks', function () {
   debug('Deckscroll');
   if (settings.value('underscript.disable.deckScroll')) return;
-  window.addEventListener('load', () => {
+  eventManager.on('load', () => {
     debug('load');
     debug($('#deckCardsKINDNESS').offset())
     const cardList = $('#yourCardList');
diff --git a/src/base/endTurnSafety.js b/src/base/endTurnSafety.js
@@ -1,5 +1,5 @@
 eventManager.on('PlayingGame', function fixEndTurn() {
-  window.addEventListener('load', () => {
+  eventManager.on('load', () => {
     const oEndTurn = endTurn;
     let endedTurn = false;
     endTurn = function restrictedEndTurn() {
diff --git a/src/base/enterOnCustom.js b/src/base/enterOnCustom.js
@@ -1,5 +1,5 @@
 onPage('GamesList', function fixEnter() {
-  window.addEventListener('load', () => {
+  eventManager.on('load', () => {
     let toast = fn.infoToast({
       text: 'You can now press enter on the Create Game window.',
       onClose: (reason) => {
diff --git a/src/base/surrender.menu.js b/src/base/surrender.menu.js
@@ -1,6 +1,6 @@
 onPage('Game', () => {
   // Unbind the "surrender" hotkey
-  window.addEventListener('load', () => {
+  eventManager.on('jQuery', () => {
     $(document).off('keyup');
   });
   function canSurrender() {
diff --git a/src/hooks/chat.js b/src/hooks/chat.js
@@ -1,4 +1,4 @@
-window.addEventListener('load', () => {
+eventManager.on('loaded', () => {
   if (typeof onMessage === 'function' && typeof socketChat !== 'undefined') {
     debug('Chat detected');
     eventManager.emit('ChatDetected');
diff --git a/src/hooks/z-jQuery.js b/src/hooks/z-jQuery.js
@@ -1,12 +1,6 @@
 // Attempt to detect jQuery
-let tries = 20;
-(function jSetup() {
-  if (typeof jQuery === "undefined") {
-    if (tries-- <= 0) { // jQuery is probably not going to load at this point...
-      return;
-    }
-    setTimeout(jSetup, 1);
-    return;
+eventManager.on('loaded', () => {
+  if (typeof jQuery !== "undefined") {
+    eventManager.emit("jQuery");
   }
-  eventManager.emit("jQuery");
-})();
+});
diff --git a/src/hooks/zz.loaded.js b/src/hooks/zz.loaded.js
@@ -1,2 +1,8 @@
 console.log(`UnderScript(v${GM_info.script.version}): Loaded`);
 eventManager.emit('UnderScript:loaded');
+document.addEventListener('DOMContentLoaded', () => {
+  eventManager.emit('loaded');
+});
+window.addEventListener('load', () => {
+  eventManager.emit('load');
+});

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ onPage('Decks', () => {`
`24`	`24`	avg.text(`(${round(list.length ? val / list.length : val)})`);
`25`	`25`	`}`
`26`	`26`
`27`		`- window.addEventListener('load', count);`
`28`		`- eventManager.on('Deck:Soul Deck:Change', count);`
	`27`	`+ eventManager.on('Deck:Soul Deck:Change load', count);`
`29`	`28`	`});`
`30`	`29`	`});`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ onPage('Decks', function () {`
`16`	`16`	`return hover.show(card);`
`17`	`17`	`}`
`18`	`18`	`// Initial load`
`19`		`- window.addEventListener('load', () => {`
	`19`	`+ eventManager.on('jQuery', () => {`
`20`	`20`	`function checkHover(el) {`
`21`	`21`	`const hover = hoverCard(el);`
`22`	`22`	`return (e) => {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-window.addEventListener('load', () => {`
	`1`	`+eventManager.on('loaded', () => {`
`2`	`2`	`if (typeof onMessage === 'function' && typeof socketChat !== 'undefined') {`
`3`	`3`	`debug('Chat detected');`
`4`	`4`	`eventManager.emit('ChatDetected');`