Side by Side Diff: adblockplus/issue-2510.patch
Issue 6238034718621696:
Issue 2483 - Give Adblock Browser its own app ID (Closed)
Patch Set:
Created May 14, 2015, 3:21 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« adblockplus/build.py ('K')
|
« adblockplus/issue-2509.patch ('k')
|
mobile/android/build.mk » ('j')
|
mobile/android/build.mk » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| (Empty) | |
| 1 # HG changeset patch | |
| 2 # User Felix Dahlke <felix@adblockplus.org> | |
| 3 # Date 1431547667 -7200 | |
| 4 # Wed May 13 22:07:47 2015 +0200 | |
| 5 # Node ID 76ddc7678a914cbcdcc2cd8132c09e8bcdd10125 | |
| 6 # Parent ae1c968784024553c3a2eaf4c446757798be7e13 | |
| 7 Issue 2510 - Support Adblock Browser | |
| 8 | |
| 9 diff -r ae1c96878402 -r 76ddc7678a91 chrome.manifest | |
| 10 --- a/chrome.manifest Tue May 12 23:01:08 2015 +0200 | |
| 11 +++ b/chrome.manifest Wed May 13 22:07:47 2015 +0200 | |
| 12 @@ -3,4 +3,4 @@ | |
| 13 locale adblockplus {{LOCALE}} chrome/locale/{{LOCALE}}/ | |
| 14 | |
| 15 # fennec settings | |
| 16 -override chrome://adblockplus/content/ui/settings.xul chrome://adblockplus/cont ent/ui/fennecSettings.xul application={a23983c0-fd0e-11dc-95ff-0800200c9a66} app lication={aa3c5121-dab2-40e2-81ca-7ea25febc110} | |
| 17 +override chrome://adblockplus/content/ui/settings.xul chrome://adblockplus/cont ent/ui/fennecSettings.xul application={a23983c0-fd0e-11dc-95ff-0800200c9a66} app lication={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={55aba3ac-94d3-41a8- 9e25-5c21fe874539} | |
| 18 diff -r ae1c96878402 -r 76ddc7678a91 dependencies | |
| 19 --- a/dependencies Tue May 12 23:01:08 2015 +0200 | |
| 20 +++ b/dependencies Wed May 13 22:07:47 2015 +0200 | |
| 21 @@ -1,4 +1,4 @@ | |
| 22 _root = hg:https://hg.adblockplus.org/ git:https://github.com/adblockplus/ | |
| 23 _self = buildtools/ensure_dependencies.py | |
| 24 -buildtools = buildtools hg:97e2e12af6e8 git:ef69bbc | |
| 25 +buildtools = buildtools hg:f9f01a4c16af git: | |
| 26 adblockplusui = adblockplusui hg:75a50600e10a git:7ebacdc | |
| 27 diff -r ae1c96878402 -r 76ddc7678a91 lib/appSupport.js | |
| 28 --- a/lib/appSupport.js Tue May 12 23:01:08 2015 +0200 | |
| 29 +++ b/lib/appSupport.js Wed May 13 22:07:47 2015 +0200 | |
| 30 @@ -690,6 +690,7 @@ | |
| 31 } | |
| 32 | |
| 33 case "fennec2": | |
| 34 + case "adblockbrowser": | |
| 35 { | |
| 36 exports.isKnownWindow = (window) => window.document.documentElement.id == " main-window"; | |
| 37 | |
| 38 diff -r ae1c96878402 -r 76ddc7678a91 lib/objectTabs.js | |
| 39 --- a/lib/objectTabs.js Tue May 12 23:01:08 2015 +0200 | |
| 40 +++ b/lib/objectTabs.js Wed May 13 22:07:47 2015 +0200 | |
| 41 @@ -178,7 +178,8 @@ | |
| 42 { | |
| 43 // Object tabs aren't usable in Fennec | |
| 44 let {application} = require("info"); | |
| 45 - if (application == "fennec" || application == "fennec2") | |
| 46 + if (application == "fennec" || application == "fennec2" || | |
| 47 + application == "adblockbrowser") | |
| 48 return; | |
| 49 | |
| 50 let {Prefs} = require("prefs"); | |
| 51 diff -r ae1c96878402 -r 76ddc7678a91 metadata.gecko | |
| 52 --- a/metadata.gecko Tue May 12 23:01:08 2015 +0200 | |
| 53 +++ b/metadata.gecko Wed May 13 22:07:47 2015 +0200 | |
| 54 @@ -34,6 +34,7 @@ | |
| 55 thunderbird=29.0/39.0 | |
| 56 seamonkey=2.26/2.36 | |
| 57 toolkit=29.0/39.0 | |
| 58 +adblockbrowser=1.0/1.0 | |
| 59 | |
| 60 [mapping] | |
| 61 chrome/content/ui/firstRun.html = adblockplusui/firstRun.html | |
| OLD | NEW |
« adblockplus/build.py ('K')
|
« adblockplus/issue-2509.patch ('k')
|
mobile/android/build.mk » ('j')
|
mobile/android/build.mk » ('J')
