address #2806

platform/webext/install.rdf

@@ -20,7 +20,7 @@
         <em:targetApplication>
             <Description>
                 <em:id>{{ec8030f7-c20a-464f-9b0e-13a3a9e97384}}</em:id>
-                <em:minVersion>52.0a1</em:minVersion>
+                <em:minVersion>54.0</em:minVersion>
                 <em:maxVersion>*</em:maxVersion>
             </Description>
         </em:targetApplication>

platform/webext/manifest.json

@@ -1,40 +1,14 @@
 {
-    "manifest_version": 2,
-
-    "name": "uBlock Origin",
-    "version": "1.9.15.101",
-
    "applications":{
       "gecko":{
          "id":"uBlock0@raymondhill.net",
-            "strict_min_version": "52.0a1"
+         "strict_min_version":"54.0"
       }
    },
-
+   "author":"All uBlock Origin contributors",
-    "commands": {
+   "background":{
-        "launch-element-zapper": {
+      "page":"background.html"
-            "suggested_key": {
    },
-            "description": "__MSG_popupTipZapper__"
-        },
-        "launch-element-picker": {
-            "suggested_key": {
-            },
-            "description": "__MSG_popupTipPicker__"
-        },
-        "launch-logger": {
-            "suggested_key": {
-            },
-            "description": "__MSG_popupTipLog__"
-        }
-    },
-    "default_locale": "en",
-    "description": "__MSG_extShortDesc__",
-    "icons": {
-        "16": "img/icon_16.png",
-        "128": "img/icon_128.png"
-    },
-
    "browser_action":{
       "browser_style":false,
       "default_icon":{
@@ -44,26 +18,59 @@
       "default_title":"uBlock Origin",
       "default_popup":"popup.html"
    },
+   "commands":{
+      "launch-element-zapper":{
+         "suggested_key":{
 
-    "author": "All uBlock Origin contributors",
+         },
-    "background": {
+         "description":"__MSG_popupTipZapper__"
-        "page": "background.html"
+      },
+      "launch-element-picker":{
+         "suggested_key":{
+
+         },
+         "description":"__MSG_popupTipPicker__"
+      },
+      "launch-logger":{
+         "suggested_key":{
+
+         },
+         "description":"__MSG_popupTipLog__"
+      }
    },
    "content_scripts":[
       {
-            "matches": ["http://*/*", "https://*/*"],
+         "matches":[
-            "js": ["js/vapi-client.js", "js/contentscript.js"],
+            "http://*/*",
+            "https://*/*"
+         ],
+         "js":[
+            "js/vapi-client.js",
+            "js/contentscript.js"
+         ],
          "run_at":"document_start",
          "all_frames":true
       },
       {
-            "matches": ["http://*/*", "https://*/*"],
+         "matches":[
-            "js": ["js/scriptlets/subscriber.js"],
+            "http://*/*",
+            "https://*/*"
+         ],
+         "js":[
+            "js/scriptlets/subscriber.js"
+         ],
          "run_at":"document_idle",
          "all_frames":false
       }
    ],
-    "minimum_chrome_version": "26.0",
+   "default_locale":"en",
+   "description":"__MSG_extShortDesc__",
+   "icons":{
+      "16":"img/icon_16.png",
+      "128":"img/icon_128.png"
+   },
+   "manifest_version":2,
+   "name":"uBlock Origin",
    "options_ui":{
       "page":"options_ui.html"
    },
@@ -77,5 +84,6 @@
       "webRequestBlocking",
       "<all_urls>"
    ],
-    "short_name": "uBlock₀"
+   "short_name":"uBlock₀",
+   "version":"1.9.15.101"
 }

src/js/tab.js

@@ -592,7 +592,7 @@ vAPI.tabs.onPopupUpdated = (function() {
                         source: 'switch',
                         raw: 'no-popups: ' + µb.hnSwitches.z + ' true'
                     };
-                    return 1;
+                    result = 1;
                 }
             }