metadata.gecko-webext - Issue 29565838: Issue 5803 - Integrate new options page into adblockpluschrome

Side by Side Diff: metadata.gecko-webext

Issue 29565838: Issue 5803 - Integrate new options page into adblockpluschrome (Closed)

Patch Set: Created Oct. 5, 2017, 9:38 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

OLD	NEW
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	8

9 [compat]	9 [compat]

10 gecko = 50.0	10 gecko = 50.0

11	11

12 [mapping]	12 [mapping]
	saroyanm 2017/10/05 21:56:58 Note: On the time of creation of this review the s Note: On the time of creation of this review the subscriptions.xml were not updated yet. So currently the EasyPrivacy and fanboy-social are not visible in Privacy and Security section on General tab. As soon it's updated I'll update dependencies accordingly. saroyanm 2017/10/06 20:41:20 Subscriptions.xml in the adblockpluscore are updat Show quoted text On 2017/10/05 21:56:58, saroyanm wrote: > Note: On the time of creation of this review the subscriptions.xml were not > updated yet. > > So currently the EasyPrivacy and fanboy-social are not visible in Privacy and > Security section on General tab. > > As soon it's updated I'll update dependencies accordingly. Subscriptions.xml in the adblockpluscore are updated. Dependencies are updated accordingly.
13 mobile-options.html = adblockplusui/mobile-options.html	13 mobile-options.html = adblockplusui/mobile-options.html

14 mobile-options.js = adblockplusui/mobile-options.js	14 mobile-options.js = adblockplusui/mobile-options.js

	15 options.html = adblockplusui/options.html
	saroyanm 2017/10/05 21:56:58 As far as I understood, the iframe issue is only r As far as I understood, the iframe issue is only relevant to the android mobile. So seems like we are safe overriding options.html, Rather than pointing everything to desktop-options.* ? Sebastian Noack 2017/10/05 22:12:34 But then it is also overridden on Android. We use Show quoted text On 2017/10/05 21:56:58, saroyanm wrote: > As far as I understood, the iframe issue is only relevant to the android mobile. > > So seems like we are safe overriding options.html, Rather than pointing > everything to desktop-options.* ? But then it is also overridden on Android. We use the same build for Firefox on desktop and Firefox Mobile. Otherwise, the iframe workaround wouldn't be necessary in the first place. saroyanm 2017/10/05 22:37:57 Noted: -> https://codereview.adblockplus.org/29565 Show quoted text On 2017/10/05 22:12:34, Sebastian Noack wrote: > On 2017/10/05 21:56:58, saroyanm wrote: > > As far as I understood, the iframe issue is only relevant to the android > mobile. > > > > So seems like we are safe overriding options.html, Rather than pointing > > everything to desktop-options.* ? > > But then it is also overridden on Android. We use the same build for Firefox on > desktop and Firefox Mobile. Otherwise, the iframe workaround wouldn't be > necessary in the first place. Noted: -> https://codereview.adblockplus.org/29565861/ Thomas Greiner 2017/10/06 12:16:55 This is not the issue because we could still map i Show quoted text On 2017/10/05 22:37:57, saroyanm wrote: > On 2017/10/05 22:12:34, Sebastian Noack wrote: > > On 2017/10/05 21:56:58, saroyanm wrote: > > > As far as I understood, the iframe issue is only relevant to the android > > mobile. > > > > > > So seems like we are safe overriding options.html, Rather than pointing > > > everything to desktop-options.* ? > > > > But then it is also overridden on Android. We use the same build for Firefox > on > > desktop and Firefox Mobile. Otherwise, the iframe workaround wouldn't be > > necessary in the first place. > > Noted: -> https://codereview.adblockplus.org/29565861/ This is not the issue because we could still map it as desktop-options.html = adblockplusui/options.html skin/options.css = adblockplusui/options.css which is why we went forward with renaming it from new-options.html to options.html in the first place. However, there seems to be one collision we can't avoid with the mapping which is options.js since both adblockpluschrome/options.html as well as adblockplusui/options.html refer to it. Therefore the rename to desktop-options.html will be necessary after all, unfortunately. saroyanm 2017/10/06 16:58:28 Acknowledged. Show quoted text On 2017/10/06 12:16:55, Thomas Greiner wrote: > On 2017/10/05 22:37:57, saroyanm wrote: > > On 2017/10/05 22:12:34, Sebastian Noack wrote: > > > On 2017/10/05 21:56:58, saroyanm wrote: > > > > As far as I understood, the iframe issue is only relevant to the android > > > mobile. > > > > > > > > So seems like we are safe overriding options.html, Rather than pointing > > > > everything to desktop-options.* ? > > > > > > But then it is also overridden on Android. We use the same build for Firefox > > on > > > desktop and Firefox Mobile. Otherwise, the iframe workaround wouldn't be > > > necessary in the first place. > > > > Noted: -> https://codereview.adblockplus.org/29565861/ > > This is not the issue because we could still map it as > > desktop-options.html = adblockplusui/options.html > skin/options.css = adblockplusui/options.css > > which is why we went forward with renaming it from new-options.html to > options.html in the first place. > > However, there seems to be one collision we can't avoid with the mapping which > is options.js since both adblockpluschrome/options.html as well as > adblockplusui/options.html refer to it. Therefore the rename to > desktop-options.html will be necessary after all, unfortunately. Acknowledged. saroyanm 2017/10/06 20:41:20 Done. Show quoted text On 2017/10/05 22:12:34, Sebastian Noack wrote: > On 2017/10/05 21:56:58, saroyanm wrote: > > As far as I understood, the iframe issue is only relevant to the android > mobile. > > > > So seems like we are safe overriding options.html, Rather than pointing > > everything to desktop-options.* ? > > But then it is also overridden on Android. We use the same build for Firefox on > desktop and Firefox Mobile. Otherwise, the iframe workaround wouldn't be > necessary in the first place. Done.
	16 options.js = adblockplusui/options.js

	17 skin/options.css = adblockplusui/skin/options.css

15 skin/abp-logo.svg = adblockplusui/skin/abp-logo.svg	18 skin/abp-logo.svg = adblockplusui/skin/abp-logo.svg

16 skin/mobile-options.css = adblockplusui/skin/mobile-options.css	19 skin/mobile-options.css = adblockplusui/skin/mobile-options.css

17 skin/mobile/checkmark.svg = adblockplusui/skin/mobile/checkmark.svg	20 skin/mobile/checkmark.svg = adblockplusui/skin/mobile/checkmark.svg

18 skin/mobile/toggle.svg = adblockplusui/skin/mobile/toggle.svg	21 skin/mobile/toggle.svg = adblockplusui/skin/mobile/toggle.svg

19 skin/mobile/trash.svg = adblockplusui/skin/mobile/trash.svg	22 skin/mobile/trash.svg = adblockplusui/skin/mobile/trash.svg

	23 skin/icons/tooltip.svg = adblockplusui/skin/icons/tooltip.svg

	24 skin/icons/gear.svg = adblockplusui/skin/icons/gear.svg

	25 skin/icons/toggle.svg = adblockplusui/skin/icons/toggle.svg

	26 skin/icons/reload.svg = adblockplusui/skin/icons/reload.svg

	27 skin/icons/globe.svg = adblockplusui/skin/icons/globe.svg

	28 skin/icons/code.svg = adblockplusui/skin/icons/code.svg

	29 skin/icons/trash.svg = adblockplusui/skin/icons/trash.svg

	30 skin/icons/delete.svg = adblockplusui/skin/icons/delete.svg

	31 skin/icons/attention.svg = adblockplusui/skin/icons/attention.svg

	32 skin/icons/checkmark.svg = adblockplusui/skin/icons/checkmark.svg

	33 skin/icons/checkbox.png = adblockplusui/skin/icons/checkbox.png

	34 skin/social/twitter.svg = adblockplusui/skin/social/twitter.svg

	35 skin/social/facebook.svg = adblockplusui/skin/social/facebook.svg

	36 skin/social/googleplus.svg = adblockplusui/skin/social/googleplus.svg

	37 skin/fonts/SourceSansPro-Regular.woff = adblockplusui/skin/fonts/SourceSansPro-R egular.woff

	38 skin/fonts/SourceSansPro-Light.woff = adblockplusui/skin/fonts/SourceSansPro-Lig ht.woff

	39 skin/fonts/SourceSansPro-bold.woff = adblockplusui/skin/fonts/SourceSansPro-bold .woff

20	40

21 [convert_js]	41 [convert_js]

22 lib/adblockplus.js += lib/firefoxDataCleanup.js	42 lib/adblockplus.js += lib/firefoxDataCleanup.js

23	43

24 [import_locales]	44 [import_locales]

25 adblockplusui/locale//mobile-options.json = =	45 adblockplusui/locale//mobile-options.json = =

	46 adblockplusui/locale//options.json = =

	47 adblockplusui/locale//common.json = =

OLD	NEW

« lib/prefs.js ('K') | « lib/prefs.js ('k') | no next file » | no next file with comments »