v8.1.5 (Dev.1) Bring back option to open features in popups (close #1065

)
rafaelgomesxyz · Dec 4, 2018 · d37cd22 · d37cd22
1 parent a08aa73
commit d37cd22
Show file tree

Hide file tree

Showing 14 changed files with 131,343 additions and 199 deletions.
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
@@ -794,7 +794,7 @@ class Esgst {
     this.st = null;
 
     this.currentVersion = `8.1.4`;
-    this.devVersion = `8.1.4`;
+    this.devVersion = `8.1.5 (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/class/Popup.js b/src/class/Popup.js
@@ -60,9 +60,15 @@ export default class Popup {
       this.title = this.icon.nextElementSibling;
       this.description = this.popup.firstElementChild.nextElementSibling;
       this.actions = this.description.nextElementSibling;
+      let settings = this.actions.firstElementChild;
       if (!details.settings) {
-        let settings = this.actions.firstElementChild;
         settings.classList.remove(`esgst-hidden`);
+        settings.addEventListener(`click`, event => {
+          if (!container.esgst.openSettingsInTab) {
+            event.preventDefault();
+            container.common.loadMenu(true);
+          }
+        });
       }
       this.description.nextElementSibling.lastElementChild.addEventListener(`click`, () => this.close());
     } else {

diff --git a/src/main.js b/src/main.js
@@ -604,6 +604,12 @@ import esgst from './class/Esgst';
         dropdown = /** @type {HTMLElement} */ menu.firstElementChild;
         button = dropdown.nextElementSibling;
         arrow = button.nextElementSibling;
+        button.addEventListener(`click`, event => {
+          if (!esgst.openSettingsInTab) {
+            event.preventDefault();
+            common.loadMenu(true);
+          }
+        });
         arrow.addEventListener(`click`, common.toggleHeaderMenu.bind(common, arrow, dropdown));
         document.addEventListener(`click`, common.closeHeaderMenu.bind(common, arrow, dropdown, menu), true);
         document.getElementById(`esgst-changelog`).addEventListener(`click`, common.loadChangelog.bind(common));
@@ -1069,6 +1075,12 @@ import esgst from './class/Esgst';
         }]);
         dropdown = /** @type {HTMLElement} */ menu.firstElementChild;
         button = dropdown.nextElementSibling;
+        button.addEventListener(`click`, event => {
+          if (!esgst.openSettingsInTab) {
+            event.preventDefault();
+            common.loadMenu(true);
+          }
+        });
         arrow = button.nextElementSibling;
         arrow.addEventListener(`click`, common.toggleHeaderMenu.bind(common, arrow, dropdown));
         document.addEventListener(`click`, common.closeHeaderMenu.bind(common, arrow, dropdown, menu), true);