#54 hopefully works

NanoAdblocker · Dec 21, 2017 · 366ed23 · 366ed23
1 parent e7f1986
commit 366ed23
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
 
     "name": "Nano Adblocker",
-    "version": "1.0.0.16",
+    "version": "1.0.0.17",
 
     "commands": {
         "launch-element-zapper": {

diff --git a/platform/chromium/nano-platform-vars.js b/platform/chromium/nano-platform-vars.js
@@ -24,4 +24,5 @@
 /******************************************************************************/
 
 window.NanoDefenderExtensionID = 'ggolfgbegefeeoocgjbmkembbncoadlb';
+window.NanoAdblockerDeveloperModeExtensionID = 'jdcnenncdjlhclmdpjeplfefbkimfalp';
 window.NanoReIsDashboardURL = /^chrome-extension:\/\/[a-z]+\/(?:nano-)?dashboard\.html/;
diff --git a/platform/chromium/vapi-common.js b/platform/chromium/vapi-common.js
@@ -65,8 +65,14 @@ vAPI.getURL = chrome.runtime.getURL;
 
 /******************************************************************************/
 
-// Patch 2017-12-07: Add a couple placeholders, might need a real i18n system
-// soon...
+vAPI.getExtensionID = function() {
+    return chrome.runtime.id;
+};
+
+/******************************************************************************/
+
+// Patch 2017-12-07: Add a couple placeholders
+// The new and robust i18n system is coming after the new dashboard
 var i18nPlaceholders = {
     'genericYes': 'Yes',
     'genericNo': 'No',

diff --git a/src/js/nano-dashboard-bootstrap.js b/src/js/nano-dashboard-bootstrap.js
@@ -2,6 +2,14 @@
 "use strict";
 
 (async () => {
+    // I got an email saying it does not work at all, well, the new dashboard does not always work as it
+    // is not done yet, I don't think I have any link that leads to it in user-accessible UI
+    // Automatically bump back to old dashboard if not loaded in developer mode
+    if (vAPI.getExtensionID() !== NanoAdblockerDeveloperModeExtensionID) {
+        location.href = "dashboard.html";
+        return;
+    }
+
     allowTextSelection = await readOneSettings("nanoDashboardAllowSelection");
     disableTooltips = await readOneSettings("tooltipsDisabled");
     updateCSS(); // Assertion inside

diff --git a/src/nano-dashboard.html b/src/nano-dashboard.html
@@ -445,6 +445,7 @@ <h4 data-i18n="settingOtherGroup"></h4>
         </div>
     </dialog>
 
+    <script src="js/nano-platform-vars.js"></script>
     <script src="js/vapi.js"></script>
     <script src="js/vapi-common.js"></script>
     <script src="js/vapi-client.js"></script>