metadata.common - Issue 29367475: Issue 4659 - Incorporate element hiding emulation filters

Delta Between Two Patch Sets: metadata.common

Issue 29367475: Issue 4659 - Incorporate element hiding emulation filters (Closed) Base URL: https://bitbucket.org/fhd/adblockpluschrome

Left Patch Set: Created Dec. 13, 2016, 9:24 p.m.

Right Patch Set: Remove obsolete mapping Created Dec. 20, 2016, 4:18 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

LEFT	RIGHT
1 [general]	1 [general]

2 version = 1.12.4	2 version = 1.12.4

3 backgroundScripts = lib/polyfills/fetch.js	3 backgroundScripts = ext/common.js

4 ext/common.js

5 ext/background.js	4 ext/background.js

6 lib/compat.js	5 lib/compat.js

7 lib/info.js	6 lib/info.js

8 lib/publicSuffixList.js	7 lib/publicSuffixList.js

9 lib/adblockplus.js	8 lib/adblockplus.js

10 messageResponder.js	9 messageResponder.js

11 background.js	10 background.js

12 testScripts = ../ext/common.js	11 testScripts = ../ext/common.js

13 ../ext/background.js	12 ../ext/background.js

14 ../lib/compat.js	13 ../lib/compat.js

15 ../lib/info.js	14 ../lib/info.js

16 ../lib/adblockplus.js	15 ../lib/adblockplus.js

17 ../lib/publicSuffixList.js	16 ../lib/publicSuffixList.js

18 common.js	17 common.js

19 tests/prefs.js	18 tests/prefs.js

20 tests/versionComparator.js	19 tests/versionComparator.js

21 tests/url.js	20 tests/url.js

22 tests/cssEscaping.js	21 tests/cssEscaping.js

23 permissions = http:/// https:///	22 permissions = http:/// https:///

24 author = Eyeo GmbH	23 author = Eyeo GmbH

25	24

26 [contentScripts]	25 [contentScripts]

27 document_start = ext/common.js ext/content.js core-common.js elemHideEmulation.j s include.preload.js	26 document_start = ext/common.js ext/content.js elemHideEmulation.js include.prelo ad.js

28 document_end = include.postload.js	27 document_end = include.postload.js

29	28

30 [mapping]	29 [mapping]

31 core-common.js = adblockpluscore/lib/common.js
Felix Dahlke 2016/12/13 21:27:27 common.js was already taken for adblockplusui/comm common.js was already taken for adblockplusui/common.js, but I'm not very attached to the `core-` prefix I went for here. kzar 2016/12/19 13:51:40 Mind instead using the convert_js section to combi Show quoted text On 2016/12/13 21:27:27, Felix Dahlke wrote: > common.js was already taken for adblockplusui/common.js, but I'm not very > attached to the `core-` prefix I went for here. Mind instead using the convert_js section to combine adblockpluscore/lib/common.js and adblockpluscore/chrome/content/elemHideEmulation.js into one file? You could avoid the core-common.js name that way. Also it avoids us having yet another content script. (Some users complain of the latency Adblock Plus adds to page loads and IIRC those are worsened by having multiple content scripts.) Felix Dahlke 2016/12/20 14:35:42 That's a cool idea, didn't occur to me at all. Don Show quoted text On 2016/12/19 13:51:40, kzar wrote: > On 2016/12/13 21:27:27, Felix Dahlke wrote: > > common.js was already taken for adblockplusui/common.js, but I'm not very > > attached to the `core-` prefix I went for here. > > Mind instead using the convert_js section to combine > adblockpluscore/lib/common.js and > adblockpluscore/chrome/content/elemHideEmulation.js into one file? You could > avoid the core-common.js name that way. Also it avoids us having yet another > content script. (Some users complain of the latency Adblock Plus adds to page > loads and IIRC those are worsened by having multiple content scripts.) That's a cool idea, didn't occur to me at all. Done!
32 elemHideEmulation.js = adblockpluscore/chrome/content/elemHideEmulation.js

33 ext/content.js = chrome/ext/content.js	30 ext/content.js = chrome/ext/content.js

34 ext/popup.js = chrome/ext/popup.js	31 ext/popup.js = chrome/ext/popup.js

35 subscriptions.xml = adblockpluscore/chrome/content/ui/subscriptions.xml	32 subscriptions.xml = adblockpluscore/chrome/content/ui/subscriptions.xml

36 firstRun.html = adblockplusui/firstRun.html	33 firstRun.html = adblockplusui/firstRun.html

37 common.js = adblockplusui/common.js	34 common.js = adblockplusui/common.js

38 firstRun.js = adblockplusui/firstRun.js	35 firstRun.js = adblockplusui/firstRun.js

39 i18n.js = adblockplusui/i18n.js	36 i18n.js = adblockplusui/i18n.js

40 messageResponder.js = adblockplusui/messageResponder.js	37 messageResponder.js = adblockplusui/messageResponder.js

41 icons/detailed/abp-128.png = adblockplusui/skin/abp-128.png	38 icons/detailed/abp-128.png = adblockplusui/skin/abp-128.png

42 skin/common.css = adblockplusui/skin/common.css	39 skin/common.css = adblockplusui/skin/common.css

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
88 adblockpluscore/lib/notification.js	85 adblockpluscore/lib/notification.js

89 adblockpluscore/lib/rsa.js	86 adblockpluscore/lib/rsa.js

90 adblockpluscore/lib/rusha.js	87 adblockpluscore/lib/rusha.js

91 adblockpluscore/lib/subscriptionClasses.js	88 adblockpluscore/lib/subscriptionClasses.js

92 adblockpluscore/lib/synchronizer.js	89 adblockpluscore/lib/synchronizer.js

93 lib/adblockplus.js[module] = true	90 lib/adblockplus.js[module] = true

94 lib/adblockplus.js[autoload] = filterListener,synchronizer,requestBlocker,popupB locker,subscriptionInit,filterComposer,stats,uninstall,csp	91 lib/adblockplus.js[autoload] = filterListener,synchronizer,requestBlocker,popupB locker,subscriptionInit,filterComposer,stats,uninstall,csp

95 ext/common.js = ext/common.js	92 ext/common.js = ext/common.js

96 ext/background.js = ext/background.js	93 ext/background.js = ext/background.js

97 include.postload.js = subscriptionLink.postload.js composer.postload.js	94 include.postload.js = subscriptionLink.postload.js composer.postload.js

	95 elemHideEmulation.js = adblockpluscore/lib/common.js adblockpluscore/chrome/cont ent/elemHideEmulation.js

98	96

99 [import_locales]	97 [import_locales]

100 adblockplus/chrome/locale/*/global.properties = subscription_invalid_location	98 adblockplus/chrome/locale/*/global.properties = subscription_invalid_location

101 remove_subscription_warning	99 remove_subscription_warning

102 notification_antiadblock_title	100 notification_antiadblock_title

103 notification_antiadblock_message	101 notification_antiadblock_message

104 filter_unknown_option	102 filter_unknown_option

105 filter_invalid_regexp	103 filter_invalid_regexp

106 filter_elemhide_duplicate_id	104 filter_elemhide_duplicate_id

107 filter_elemhide_nocriteria	105 filter_elemhide_nocriteria

(...skipping 14 matching lines...) Expand all Loading...
122 addSubscription.label	120 addSubscription.label

123 addSubscriptionAdd.label	121 addSubscriptionAdd.label

124 addSubscriptionOther.label	122 addSubscriptionOther.label

125 acceptableAds2.label	123 acceptableAds2.label

126 viewList.label	124 viewList.label

127 readMore.label	125 readMore.label

128 adblockplus/chrome/locale/*/subscriptionSelection.dtd = location.label	126 adblockplus/chrome/locale/*/subscriptionSelection.dtd = location.label

129 title.label	127 title.label

130 adblockplus/chrome/locale/*/meta.properties = =name	128 adblockplus/chrome/locale/*/meta.properties = =name

131 adblockplusui/locale//firstRun.json = =	129 adblockplusui/locale//firstRun.json = =

LEFT	RIGHT