Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: metadata.gecko-webext

Issue 29536764: Issue 5587, 5748 - Use mobile options page on Firefox for Android (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Left Patch Set: Add options page loader Created Sept. 8, 2017, 9:59 a.m.
Right Patch Set: Remove workaround for FOUC issue and update adblockplusui dependency Created Oct. 5, 2017, 1:24 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « metadata.chrome ('k') | options.html » ('j') | options.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 [default] 1 [default]
2 inherit = metadata.chrome 2 inherit = metadata.chrome
3 3
4 [general] 4 [general]
5 id={d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d} 5 id={d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}
6 basename = adblockplusfirefox 6 basename = adblockplusfirefox
7 version = 2.99.0 7 version = 2.99.0
8 # Firefox has a different options page depending on whether it's desktop or
Manish Jethani 2017/09/08 10:02:25 Now Firefox has a different file for the options p
Manish Jethani 2017/09/08 10:46:45 And there's no need for this now. All browsers wil
9 # mobile.
10 options = options-loader.html
11 8
12 [compat] 9 [compat]
13 gecko = 50.0 10 gecko = 50.0
14 11
15 [mapping] 12 [mapping]
16 mobile-options.html = adblockplusui/mobile-options.html 13 mobile-options.html = adblockplusui/mobile-options.html
17 mobile-options.js = adblockplusui/mobile-options.js 14 mobile-options.js = adblockplusui/mobile-options.js
18 skin/abp-logo.svg = adblockplusui/skin/abp-logo.svg 15 skin/abp-logo.svg = adblockplusui/skin/abp-logo.svg
19 skin/mobile-options.css = adblockplusui/skin/mobile-options.css 16 skin/mobile-options.css = adblockplusui/skin/mobile-options.css
20 skin/mobile/checkmark.svg = adblockplusui/skin/mobile/checkmark.svg 17 skin/mobile/checkmark.svg = adblockplusui/skin/mobile/checkmark.svg
21 skin/mobile/toggle.svg = adblockplusui/skin/mobile/toggle.svg 18 skin/mobile/toggle.svg = adblockplusui/skin/mobile/toggle.svg
22 skin/mobile/trash.svg = adblockplusui/skin/mobile/trash.svg 19 skin/mobile/trash.svg = adblockplusui/skin/mobile/trash.svg
23 20
24 [convert_js] 21 [convert_js]
25 # See https://bugzil.la/1190687 - pop-up blocking won't work right now
26 lib/adblockplus.js -= lib/popupBlocker.js
27 lib/adblockplus.js += lib/firefoxDataCleanup.js 22 lib/adblockplus.js += lib/firefoxDataCleanup.js
28 lib/adblockplus.js += lib/browserAction.js
29 23
30 [import_locales] 24 [import_locales]
31 adblockplusui/locale/*/mobile-options.json = =* 25 adblockplusui/locale/*/mobile-options.json = =*
LEFTRIGHT

Powered by Google App Engine
This is Rietveld