- Fix a style issue with game categories that are moved to the giveaw…

…ay columns (close #979) - Fix a bug that duplicates game categories (close #980) - Fix a bug in Giveaway Winners Link (close #981) - Fix a style issue in Grid View (close #982)
rafaelgomesxyz · Oct 15, 2018 · f18be25 · f18be25
1 parent b951406
commit f18be25
Show file tree

Hide file tree

Showing 14 changed files with 269,490 additions and 552 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/ESGST.user.js b/ESGST.user.js
diff --git a/ESGST.user.js.map b/ESGST.user.js.map
diff --git a/Extension/esgst.js b/Extension/esgst.js
diff --git a/Extension/esgst.js.map b/Extension/esgst.js.map
diff --git a/Extension/eventPage.js b/Extension/eventPage.js
diff --git a/Extension/manifest.json b/Extension/manifest.json
@@ -1,4 +1,9 @@
 {
+  "applications": {
+    "gecko": {
+      "id": "{71de700c-ca62-4e31-9de6-93e3c30633d6}"
+    }
+  },
   "author": "gsrafael01",
   "background": {
     "scripts": [

diff --git a/Extension/manifest.json.bkp b/Extension/manifest.json.bkp
diff --git a/src/class/Esgst.js b/src/class/Esgst.js
@@ -647,7 +647,7 @@ class Esgst {
     this.st = null;
 
     this.currentVersion = `8.0.2`;
-    this.devVersion = `8.0.2`;
+    this.devVersion = `8.0.3 (Dev.1)`;
     // noinspection SpellCheckingInspection
     this.icon = `data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqv8DCbP/Hgeq+CQIrf8iCK3/Igit/yIIrf8iB6//Iwit9x8Aqv8DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKr0GAa2/c0DvfzfA7f83QO3/N0Dt/zdA7f83QO+/d4Gs/3OAKP1GQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACm/xQFs/n2Bcf//wW///8FwP//BcD//wW///8Fx///BbP69gC2/xUAAAAAAAAAAAAAAAAA/1UDFptOFxSZMxkLpJktAq720QW1+ugEsfvjA7b92wO2/dsEsfvjBbX66Aau/dEoiO4tUlLWGU5k3hdVVf8DEJxKHxWqT8cVrU7uE6VN0guqny0Apv8XAJfQGwBAVywAQFcsAJfQGwCx/xcogugtS2Lk0lBl6u5Qae7ISmPeHxagSSMVr07jF7lV/xOiSu0brgATAAAAAAAAAA8AAAC/AAAAwAAAABAAAAAAYznjEkth4OxWb/3/T2jv40lf4iMXnksiEq1O3RayUv8UpEnkEo0+HQAAABkAAABBAAAA8QAAAPEAAABBAAAAGUBSvxxOYeDjU2v0/05m7d1LYuEiF55LIhKtTt0Ws1L/FahN2gU1FTAAAADAAAAA7AAAAP0AAAD9AAAA7AAAAMAVG0owUGPm2lNr9P9OZu3dS2LhIheeSyISrU7dFrNS/xWoTdoFNRswAAAAvwAAAOsAAAD9AAAA/QAAAOsAAADAFRtKMFBj6NpTa/T/Tmbt3Uti4SIXnksiEq1O3RayUv8UpEnkEo0+HQAAABgAAABAAAAA8QAAAPEAAABBAAAAGT5PuR1OYeDjU2v0/05m7d1LYuEiFqBJIxWuT+QXuVX/E6JL7QC8XhMAAAAAAAAADwAAAL8AAAC/AAAAEAAAAAAOR/8SSWLh7FZv/f9PaO/jSV/iIxCUSh8Vrk7HFqxN7ROlS9JskzMt1XULGK12EhxGLgYsRy8GK612EhzVgAsYgmxxLU1i39JNZ+vtT2fwx0pj1h8AqlUDF65GFgqZUhlsiC0txH0T0s5/EujJgBPkz4QR28+EEdvJgBPkzn8Q6Md+E9KLdHosM1LWGUZo6BZVVf8DAAAAAAAAAAAAAAAA/2YAFMl9EvbgjRb/14gV/9eIFf/XiBX/14gV/9+NFv/KgBD254YAFQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAL91FRjKgRHN1IgU3s+EEt3PhBLdz4QS3c+EEt3UiBTezYMRzcJ6FBkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACqqgADxIARHr18FiO8eA8ivHgPIrx4DyK8eA8ivXwPI8SAER7/VQADAAAAAAAAAAAAAAAA78cAAPA3AAD4FwAABCAAADGOAAAE+AAAkBEAAJ55AACYOQAAlgEAAER4AAAXaAAATnoAAPgXAAD0JwAA69cAAA==`;
     // noinspection SpellCheckingInspection

diff --git a/src/modules/Common.js b/src/modules/Common.js
@@ -9301,6 +9301,10 @@ class Common extends Module {
       padding: 0;
     }
     
+     .esgst-page-heading-buttons >* {
+      margin-right: 5px;
+    }
+    
     .esgst-inline-list >*:not(:last-child) {
       margin-right: 15px;
     }
@@ -11314,16 +11318,14 @@ class Common extends Module {
     }
 
     .esgst-gv-popout .giveaway__heading {
-      display: block;
+      display: flex;
+      flex-wrap: wrap;
       height: auto;
     }
 
     .esgst-gv-popout .giveaway__heading__name {
       display: inline-block;
       font-size: 12px;
-      max-width: 150px;
-      overflow: hidden;
-      text-overflow: ellipsis;
       vertical-align: middle;
     }
 

diff --git a/src/modules/Games/GameCategories.js b/src/modules/Games/GameCategories.js
@@ -2626,6 +2626,10 @@ class GamesGameCategories extends Module {
           delete this.esgst.gcToFetch[type][id];
         }
       }
+      const oldElements = games[i].container.querySelectorAll(`.esgst-gc`);
+      for (const element of oldElements) {
+        element.remove();
+      }
       panel = games[i].container.getElementsByClassName(`esgst-gc-panel`)[0];
       if (panel && !panel.getAttribute(`data-gcReady`)) {
         if (this.esgst.gc_il && !this.esgst.giveawayPath) {

diff --git a/src/modules/Giveaways.js b/src/modules/Giveaways.js
@@ -610,11 +610,11 @@ class Giveaways extends Module {
           if (element.getAttribute(`data-draggable-id`).match(/elgb|gp/)) {
             element.classList.add(`esgst-giveaway-column-button`);
           }
-          if (element.getAttribute(`data-draggable-id`).match(/steam|search|hideGame/)) {
+          if (!this.esgst.giveawayPath && element.getAttribute(`data-draggable-id`).match(/steam|search|hideGame/)) {
             element.classList.remove(`giveaway__icon`);
           }
+          element.classList.add(this.esgst.giveawayPath ? `featured__column` : `giveaway__column`);
           if (element.getAttribute(`data-color`)) {
-            element.classList.add(this.esgst.giveawayPath ? `featured__column` : `giveaway__column`);
             element.firstElementChild.style.color = element.getAttribute(`data-bgColor`);
             element.style.color = ``;
             element.style.backgroundColor = ``;
@@ -633,11 +633,11 @@ class Giveaways extends Module {
           if (element.getAttribute(`data-draggable-id`).match(/elgb|gp/)) {
             element.classList.remove(`esgst-giveaway-column-button`);
           }
-          if (element.getAttribute(`data-draggable-id`).match(/steam|search|hideGame/)) {
+          if (!this.esgst.giveawayPath && element.getAttribute(`data-draggable-id`).match(/steam|search|hideGame/)) {
             element.classList.remove(`giveaway__icon`);
           }
+          element.classList.remove(this.esgst.giveawayPath ? `featured__column` : `giveaway__column`);
           if (element.getAttribute(`data-color`)) {
-            element.classList.remove(this.esgst.giveawayPath ? `featured__column` : `giveaway__column`);
             element.style.color = element.getAttribute(`data-color`);
             element.style.backgroundColor = element.getAttribute(`data-bgColor`);
           }
@@ -655,11 +655,11 @@ class Giveaways extends Module {
           if (element.getAttribute(`data-draggable-id`).match(/elgb|gp/)) {
             element.classList.remove(`esgst-giveaway-column-button`);
           }
-          if (element.getAttribute(`data-draggable-id`).match(/steam|search|hideGame/)) {
+          if (!this.esgst.giveawayPath && element.getAttribute(`data-draggable-id`).match(/steam|search|hideGame/)) {
             element.classList.add(`giveaway__icon`);
           }
+          element.classList.remove(this.esgst.giveawayPath ? `featured__column` : `giveaway__column`);
           if (element.getAttribute(`data-color`)) {
-            element.classList.remove(this.esgst.giveawayPath ? `featured__column` : `giveaway__column`);
             element.style.color = element.getAttribute(`data-color`);
             element.style.backgroundColor = element.getAttribute(`data-bgColor`);
           }
@@ -677,11 +677,11 @@ class Giveaways extends Module {
           if (element.getAttribute(`data-draggable-id`).match(/elgb|gp/)) {
             element.classList.remove(`esgst-giveaway-column-button`);
           }
-          if (element.getAttribute(`data-draggable-id`).match(/steam|search|hideGame/)) {
+          if (!this.esgst.giveawayPath && element.getAttribute(`data-draggable-id`).match(/steam|search|hideGame/)) {
             element.classList.remove(`giveaway__icon`);
           }
+          element.classList.remove(this.esgst.giveawayPath ? `featured__column` : `giveaway__column`);
           if (element.getAttribute(`data-color`)) {
-            element.classList.remove(this.esgst.giveawayPath ? `featured__column` : `giveaway__column`);
             element.style.color = element.getAttribute(`data-color`);
             element.style.backgroundColor = element.getAttribute(`data-bgColor`);
           }
@@ -699,11 +699,11 @@ class Giveaways extends Module {
           if (element.getAttribute(`data-draggable-id`).match(/elgb|gp/)) {
             element.classList.remove(`esgst-giveaway-column-button`);
           }
-          if (element.getAttribute(`data-draggable-id`).match(/steam|search|hideGame/)) {
+          if (!this.esgst.giveawayPath && element.getAttribute(`data-draggable-id`).match(/steam|search|hideGame/)) {
             element.classList.remove(`giveaway__icon`);
           }
+          element.classList.remove(this.esgst.giveawayPath ? `featured__column` : `giveaway__column`);
           if (element.getAttribute(`data-color`)) {
-            element.classList.remove(this.esgst.giveawayPath ? `featured__column` : `giveaway__column`);
             element.style.color = element.getAttribute(`data-color`);
             element.style.backgroundColor = element.getAttribute(`data-bgColor`);
           }

diff --git a/src/modules/Giveaways/GiveawayWinnersLink.js b/src/modules/Giveaways/GiveawayWinnersLink.js
@@ -46,7 +46,7 @@ class GiveawaysGiveawayWinnersLink extends Module {
           },
           type: `i`
         }, {
-          text: `${giveaway.winners} winners`,
+          text: `${Array.isArray(giveaway.winners) ? giveaway.winners.length : giveaway.winners} winners`,
           type: `span`
         }]
       }]);

diff --git a/src/modules/Giveaways/GridView.js b/src/modules/Giveaways/GridView.js
@@ -167,12 +167,6 @@ class GiveawaysGridView extends Module {
         },
         type: `div`
       }]);
-      createElements(giveaway.headingName, `afterEnd`, [{
-        type: `br`
-      }]);
-      createElements(giveaway.pointsContainer, `afterEnd`, [{
-        type: `br`
-      }]);
       giveaway.endTimeColumn.classList.add(`esgst-hidden`);
       giveaway.startTimeColumn.classList.add(`esgst-hidden`);
       giveaway.entriesLink.lastElementChild.textContent = giveaway.entriesLink.textContent.replace(/[^\d,]+/g, ``);