metadata.chrome - Issue 29409555: Issue 5083 - Fix metadata regression introduced in previous patch set

Side by Side Diff: metadata.chrome

Issue 29409555: Issue 5083 - Fix metadata regression introduced in previous patch set (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome

Patch Set: Created April 11, 2017, 5:27 a.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 [general]	1 [general]

2 basename = adblockpluschrome	2 basename = adblockpluschrome

3 version = 1.13.2	3 version = 1.13.2

4 author = eyeo GmbH	4 author = eyeo GmbH

5 permissions = tabs	5 permissions = tabs

6 http:///	6 http:///

7 https:///	7 https:///

8 ws:///	8 ws:///

9 wss:///	9 wss:///

10 contextMenus	10 contextMenus

11 webRequest	11 webRequest

12 webRequestBlocking	12 webRequestBlocking

13 webNavigation	13 webNavigation

14 storage	14 storage

15 unlimitedStorage	15 unlimitedStorage

16 notifications	16 notifications

17 backgroundScripts = ext/common.js	17 backgroundScripts = ext/common.js

	18 ext/background.js

18 lib/compat.js	19 lib/compat.js

19 lib/publicSuffixList.js	20 lib/publicSuffixList.js

20 lib/adblockplus.js	21 lib/adblockplus.js

21 messageResponder.js	22 messageResponder.js

22 ext/background.js

23 background.js	23 background.js

24 testScripts = ../ext/common.js	24 testScripts = ../ext/common.js

25 ../ext/background.js	25 ../ext/background.js

26 ../lib/compat.js	26 ../lib/compat.js

27 ../lib/adblockplus.js	27 ../lib/adblockplus.js

28 ../lib/publicSuffixList.js	28 ../lib/publicSuffixList.js

29 common.js	29 common.js

30 tests/prefs.js	30 tests/prefs.js

31 tests/versionComparator.js	31 tests/versionComparator.js

32 tests/url.js	32 tests/url.js

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
83 lib/notificationHelper.js	83 lib/notificationHelper.js

84 lib/prefs.js	84 lib/prefs.js

85 lib/punycode.js	85 lib/punycode.js

86 lib/requestBlocker.js	86 lib/requestBlocker.js

87 lib/stats.js	87 lib/stats.js

88 lib/subscriptionInit.js	88 lib/subscriptionInit.js

89 lib/tldjs.js	89 lib/tldjs.js

90 lib/url.js	90 lib/url.js

91 lib/utils.js	91 lib/utils.js

92 lib/whitelisting.js	92 lib/whitelisting.js

93 lib/devtools.js

94 lib/popupBlocker.js

95 lib/uninstall.js

96 lib/csp.js

97 adblockpluscore/lib/coreUtils.js	93 adblockpluscore/lib/coreUtils.js

98 adblockpluscore/lib/common.js	94 adblockpluscore/lib/common.js

99 adblockpluscore/lib/downloader.js	95 adblockpluscore/lib/downloader.js

100 adblockpluscore/lib/elemHide.js	96 adblockpluscore/lib/elemHide.js

101 adblockpluscore/lib/elemHideEmulation.js	97 adblockpluscore/lib/elemHideEmulation.js

102 adblockpluscore/lib/events.js	98 adblockpluscore/lib/events.js

103 adblockpluscore/lib/filterClasses.js	99 adblockpluscore/lib/filterClasses.js

104 adblockpluscore/lib/filterListener.js	100 adblockpluscore/lib/filterListener.js

105 adblockpluscore/lib/filterNotifier.js	101 adblockpluscore/lib/filterNotifier.js

106 adblockpluscore/lib/filterStorage.js	102 adblockpluscore/lib/filterStorage.js

107 adblockpluscore/lib/jsbn.js	103 adblockpluscore/lib/jsbn.js

108 adblockpluscore/lib/matcher.js	104 adblockpluscore/lib/matcher.js

109 adblockpluscore/lib/notification.js	105 adblockpluscore/lib/notification.js

110 adblockpluscore/lib/rsa.js	106 adblockpluscore/lib/rsa.js

111 adblockpluscore/lib/rusha.js	107 adblockpluscore/lib/rusha.js

112 adblockpluscore/lib/subscriptionClasses.js	108 adblockpluscore/lib/subscriptionClasses.js

113 adblockpluscore/lib/synchronizer.js	109 adblockpluscore/lib/synchronizer.js

114 adblockplusui/lib/antiadblockInit.js	110 adblockplusui/lib/antiadblockInit.js

115 lib/adblockplus.js[module] = true	111 lib/adblockplus.js[module] = true

116 lib/adblockplus.js[injectinfomodule] = true	112 lib/adblockplus.js[injectinfomodule] = true

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

118 include.postload.js = subscriptionLink.postload.js composer.postload.js	114 include.postload.js = subscriptionLink.postload.js composer.postload.js

119 elemHideEmulation.js = adblockpluscore/lib/common.js adblockpluscore/chrome/cont ent/elemHideEmulation.js	115 elemHideEmulation.js = adblockpluscore/lib/common.js adblockpluscore/chrome/cont ent/elemHideEmulation.js

	116 lib/adblockplus.js +=
	Sebastian Noack 2017/04/11 08:22:19 Why not just put them at the bottom of the list ab Why not just put them at the bottom of the list above? module.js = a.js b.js c.js is essentially the same as: module.js = a.js b.js module.js += c.js The latter syntax merely exist, so that you can append to a list that was initially defined in a metadata file inherited from. Moreover, I wonder why the order even matters here? The modules are executed in the order they are imported anyway, in order to avoid issues like this. The problem with ext/background.js is different since it is not a module, but are you sure that the changing the order of the modules here is necessary? jsonesen 2017/04/11 09:06:04 My bad, I thought last night when testing that I c Show quoted text On 2017/04/11 08:22:19, Sebastian Noack wrote: > Why not just put them at the bottom of the list above? > > module.js = a.js b.js c.js > > is essentially the same as: > > module.js = a.js b.js > module.js += c.js > > The latter syntax merely exist, so that you can append to a list that was > initially defined in a metadata file inherited from. > > Moreover, I wonder why the order even matters here? The modules are executed in > the order they are imported anyway, in order to avoid issues like this. The > problem with ext/background.js is different since it is not a module, but are > you sure that the changing the order of the modules here is necessary? My bad, I thought last night when testing that I checked whether or not they were required here and found they were. As discussed In IRC I was mistaken. Will fix.
	117 lib/devtools.js

	118 lib/popupBlocker.js

	119 lib/uninstall.js

	120 lib/csp.js

120	121

121 [import_locales]	122 [import_locales]

122 adblockplus/chrome/locale/*/global.properties = subscription_invalid_location	123 adblockplus/chrome/locale/*/global.properties = subscription_invalid_location

123 remove_subscription_warning	124 remove_subscription_warning

124 =notification_antiadblock_title	125 =notification_antiadblock_title

125 =notification_antiadblock_message	126 =notification_antiadblock_message

126 filter_unknown_option	127 filter_unknown_option

127 filter_invalid_regexp	128 filter_invalid_regexp

128 filter_elemhide_duplicate_id	129 filter_elemhide_duplicate_id

129 filter_elemhide_nocriteria	130 filter_elemhide_nocriteria

(...skipping 14 matching lines...) Expand all Loading...
144 addSubscription.label	145 addSubscription.label

145 addSubscriptionAdd.label	146 addSubscriptionAdd.label

146 addSubscriptionOther.label	147 addSubscriptionOther.label

147 acceptableAds2.label	148 acceptableAds2.label

148 viewList.label	149 viewList.label

149 readMore.label	150 readMore.label

150 adblockplus/chrome/locale/*/subscriptionSelection.dtd = location.label	151 adblockplus/chrome/locale/*/subscriptionSelection.dtd = location.label

151 title.label	152 title.label

152 adblockplus/chrome/locale/*/meta.properties = =name	153 adblockplus/chrome/locale/*/meta.properties = =name

153 adblockplusui/locale//firstRun.json = =	154 adblockplusui/locale//firstRun.json = =

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »