#146 Fix a bug in Whitelist/Blacklist Sorter that opens the whitelist…

… in the blacklist page Close #146
rafaelgomesxyz · Nov 8, 2017 · 08e53d3 · 08e53d3
1 parent b89e9c4
commit 08e53d3
Showing 1 changed file with 26 additions and 27 deletions.
diff --git a/Extension/esgst.js b/Extension/esgst.js
@@ -3552,7 +3552,6 @@ function loadEsgst(storage) {
                 },
                 {
                     id: `wbs`,
-                    load: loadWbs,
                     name: `Whitelist/Blacklist Sorter`,
                     sg: true,
                     sync: `Whitelist and Blacklist`,
@@ -7869,6 +7868,32 @@ function loadFeatures() {
         loadDiscussionFeatures(document, true);
     }
 
+    if (esgst.whitelistPath || esgst.blacklistPath) {
+        if (esgst.wbs) {
+            let button2, button1, dateKey, key, saveKey;
+            button2 = insertHtml(esgst.hideButtons && esgst.hideButtons_wbsDesc ? esgst.leftButtons : esgst.mainPageHeading, `afterBegin`, `
+                <div class="esgst-heading-button" title="Sort by added date from newest to oldest">
+                    <i class="fa fa-sort-amount-desc"></i>
+                </div>
+            `);
+            button1 = insertHtml(esgst.hideButtons && esgst.hideButtons_wbsAsc ? esgst.leftButtons : esgst.mainPageHeading, `afterBegin`, `
+                <div class="esgst-heading-button" title="Sort by added date from oldest to newest">
+                    <i class="fa fa-sort-amount-asc"></i>
+                </div>
+            `);
+            if (esgst.whitelistPath) {
+                dateKey = `whitelistedDate`;
+                key = `whitelist`;
+                saveKey = `whitelisted`;
+            } else {
+                dateKey = `blacklistedDate`;
+                key = `blacklist`;
+                saveKey = `blacklisted`;
+            }
+            addWbsButton(dateKey, key, saveKey, button1, button2);
+        }
+    }
+
     if (esgst.ttec) {
         esgst.giveawayFeatures.push(calculateTtecTime);
     }
@@ -24894,32 +24919,6 @@ function addWbhIcons(currentUsers) {
 
 /* [WBS] Whitelist/Blacklist Sorter */
 
-function loadWbs() {
-    if (esgst.whitelistPath || esgst.blacklistPath) {
-        let button2, button1, dateKey, key, saveKey;
-        button2 = insertHtml(esgst.hideButtons && esgst.hideButtons_wbsDesc ? esgst.leftButtons : esgst.mainPageHeading, `afterBegin`, `
-            <div class="esgst-heading-button" title="Sort by added date from newest to oldest">
-                <i class="fa fa-sort-amount-desc"></i>
-            </div>
-        `);
-        button1 = insertHtml(esgst.hideButtons && esgst.hideButtons_wbsAsc ? esgst.leftButtons : esgst.mainPageHeading, `afterBegin`, `
-            <div class="esgst-heading-button" title="Sort by added date from oldest to newest">
-                <i class="fa fa-sort-amount-asc"></i>
-            </div>
-        `);
-        if (esgst.whitelistPath) {
-            dateKey = `whitelistedDate`;
-            key = `whitelist`;
-            saveKey = `whitelisted`;
-        } else {
-            dateKey = `blacklistedDate`;
-            key = `blacklist`;
-            saveKey = `blacklisted`;
-        }
-        addWbsButton(`whitelistedDate`, `whitelist`, `whitelisted`, button1, button2);
-    }
-}
-
 function addWbsButton(dateKey, key, saveKey, sortAscButton, sortDescButton) {
     sortAscButton.addEventListener(`click`, function () {
             sortWbsList(true, dateKey, `fa-sort-amount-asc`, key, saveKey, `Oldest to newest ${saveKey} users:`);