Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

address #2806

This commit is contained in:
gorhill 2017-07-21 07:48:50 -04:00
parent b0ff5396cf
commit f5ef83719c
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
3 changed files with 86 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/webext/install.rdf
View File

@ -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>

160
platform/webext/manifest.json
View File

@ -1,81 +1,89 @@
{
"manifest_version": 2,
"applications":{
"gecko":{
"id":"uBlock0@raymondhill.net",
"strict_min_version":"54.0"
}
},
"author":"All uBlock Origin contributors",
"background":{
"page":"background.html"
},
"browser_action":{
"browser_style":false,
"default_icon":{
"19":"img/browsericons/icon19.png",
"38":"img/browsericons/icon38.png"
},
"default_title":"uBlock Origin",
"default_popup":"popup.html"
},
"commands":{
"launch-element-zapper":{
"suggested_key":{
"name": "uBlock Origin",
"version": "1.9.15.101",
},
"description":"__MSG_popupTipZapper__"
},
"launch-element-picker":{
"suggested_key":{
"applications": {
"gecko": {
"id": "uBlock0@raymondhill.net",
"strict_min_version": "52.0a1"
}
},
},
"description":"__MSG_popupTipPicker__"
},
"launch-logger":{
"suggested_key":{
"commands": {
"launch-element-zapper": {
"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": {
"19": "img/browsericons/icon19.png",
"38": "img/browsericons/icon38.png"
},
"default_title": "uBlock Origin",
"default_popup": "popup.html"
},
"author": "All uBlock Origin contributors",
"background": {
"page": "background.html"
},
"content_scripts": [
{
"matches": ["http://*/*", "https://*/*"],
"js": ["js/vapi-client.js", "js/contentscript.js"],
"run_at": "document_start",
"all_frames": true
},
{
"matches": ["http://*/*", "https://*/*"],
"js": ["js/scriptlets/subscriber.js"],
"run_at": "document_idle",
"all_frames": false
}
],
"minimum_chrome_version": "26.0",
"options_ui": {
"page": "options_ui.html"
},
"permissions": [
"contextMenus",
"privacy",
"storage",
"tabs",
"webNavigation",
"webRequest",
"webRequestBlocking",
"<all_urls>"
],
"short_name": "uBlock₀"
},
"description":"__MSG_popupTipLog__"
}
},
"content_scripts":[
{
"matches":[
"http://*/*",
"https://*/*"
],
"js":[
"js/vapi-client.js",
"js/contentscript.js"
],
"run_at":"document_start",
"all_frames":true
},
{
"matches":[
"http://*/*",
"https://*/*"
],
"js":[
"js/scriptlets/subscriber.js"
],
"run_at":"document_idle",
"all_frames":false
}
],
"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"
},
"permissions":[
"contextMenus",
"privacy",
"storage",
"tabs",
"webNavigation",
"webRequest",
"webRequestBlocking",
"<all_urls>"
],
"short_name":"uBlock₀",
"version":"1.9.15.101"
}

2
src/js/tab.js
View File

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