Don't offer anymore the option for the None/Firefox default theme

It's still possible to use it till Firefox 57, but can't be selected anymore
Croydon · Sep 8, 2017 · 27bfb17 · 27bfb17
1 parent d8fd5c0
commit 27bfb17
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 17 deletions.
diff --git a/index.js b/index.js
@@ -68,7 +68,6 @@ function webext_replyHandler(message)
     if(message.type == "settings.post")
     {
         // Get settings from WebExt
-        debugOutput(message.name + " new value SDK: " + message.value);
         observPrefs(message.name);
     }
 
@@ -184,7 +183,7 @@ function sdk_init()
 // Entry point of the add-on
 exports.main = function (options, callbacks) {
     // WebExtension startup + communication
-    webExtension.startup().then(browser =>
+    webExtension.startup().then(({browser}) =>
     {
         browser.runtime.onMessage.addListener((msg, sender, sendResponse) =>
         {

diff --git a/webextension/main.js b/webextension/main.js
@@ -233,7 +233,8 @@ function sdk_sendMsg(message)
 {
     browser.runtime.sendMessage(message).then(reply =>
     {
-        if (reply) {
+        if (reply)
+        {
             sdk_replyHandler(reply);
         }
     });
@@ -312,7 +313,7 @@ setTimeout(function()
         let version = browserInfo.version;
 
         // Enforce debugging, hidden settings and experiment flag to true for Firefox Nightly
-        if(version.includes("a1"))
+        if(version.includes("a"))
         {
             save_setting("showHiddenSettings", true);
             save_setting("debug", true);

diff --git a/webextension/options/options.html b/webextension/options/options.html
@@ -15,7 +15,7 @@
     .preferences-description {
         font-size: 90.9%;
         color: graytext;
-        margin-top: -3px;
+        /*margin-top: -3px;*/
         white-space: pre-wrap;
     }
 
@@ -58,7 +58,7 @@
     </style>
 </head>
 
-<body class="detail-view-container" contextmenu="vtr-options">
+<body class="detail-view-container">
     <form>
 
         <table id="settings" style="width: 100%;">
@@ -67,10 +67,6 @@
 
     </form>
 
-    <menu type="context" id="vtr-options">
-      <menuitem icon="/data/icon-16.png" id="contextmenu-show-hidden-options">VTR: Show hidden options</menuitem>
-    </menu>
-
     <script src="options.js"></script>
 
 </body>

diff --git a/webextension/options/options.js b/webextension/options/options.js
@@ -113,7 +113,8 @@ function load_value(input)
     // buttons don't have values
     if(input.type != "button")
     {
-        main.get_setting(input.id).then(value => {
+        main.get_setting(input.id).then(value =>
+        {
             if(input.type == "checkbox")
             {
                 document.getElementById(input.id).checked = value;

diff --git a/webextension/options/options.json b/webextension/options/options.json
@@ -30,10 +30,6 @@
 		"title": "Theme",
 		"value": "dark",
 		"options": [
-			{
-				"value": "none",
-				"label": "None / Firefox default"
-			},
 			{
 				"value": "dark",
 				"label": "Dark (recommended)"
@@ -92,9 +88,9 @@
     "showHiddenSettings": {
         "name": "showHiddenSettings",
         "type": "bool",
-        "title": "Display hidden settings",
+        "title": "Display advanced settings",
         "value": false,
-        "hidden": true
+        "hidden": false
     },
 	"width": {
 		"name": "width",