Side by Side Diff: metadata.common
Issue 29367475:
Issue 4659 - Incorporate element hiding emulation filters (Closed)
Base URL: https://bitbucket.org/fhd/adblockpluschrome
Patch Set: Update adblockplusui dependency and combine common.js and elemHideEmulation.js content scripts
Created Dec. 20, 2016, 2:30 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« include.preload.js ('k')
|
no next file »
|
no next file with comments »
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 |
|---|---|
| 1 [general] | 1 [general] |
| 2 version = 1.12.4 | 2 version = 1.12.4 |
| 3 backgroundScripts = ext/common.js | 3 backgroundScripts = ext/common.js |
|
Felix Dahlke
2016/12/20 14:35:43
Caused by rebasing.
| |
| 4 ext/background.js | 4 ext/background.js |
| 5 lib/compat.js | 5 lib/compat.js |
| 6 lib/info.js | 6 lib/info.js |
| 7 lib/publicSuffixList.js | 7 lib/publicSuffixList.js |
| 8 lib/adblockplus.js | 8 lib/adblockplus.js |
| 9 messageResponder.js | 9 messageResponder.js |
| 10 background.js | 10 background.js |
| 11 testScripts = ../ext/common.js | 11 testScripts = ../ext/common.js |
| 12 ../ext/background.js | 12 ../ext/background.js |
| 13 ../lib/compat.js | 13 ../lib/compat.js |
| 14 ../lib/info.js | 14 ../lib/info.js |
| 15 ../lib/adblockplus.js | 15 ../lib/adblockplus.js |
| 16 ../lib/publicSuffixList.js | 16 ../lib/publicSuffixList.js |
| 17 common.js | 17 common.js |
| 18 tests/prefs.js | 18 tests/prefs.js |
| 19 tests/versionComparator.js | 19 tests/versionComparator.js |
| 20 tests/url.js | 20 tests/url.js |
| 21 tests/cssEscaping.js | 21 tests/cssEscaping.js |
| 22 permissions = http://*/* https://*/* | 22 permissions = http://*/* https://*/* |
| 23 author = Eyeo GmbH | 23 author = Eyeo GmbH |
| 24 | 24 |
| 25 [contentScripts] | 25 [contentScripts] |
| 26 document_start = ext/common.js ext/content.js cssProperties.js include.preload.j s | 26 document_start = ext/common.js ext/content.js elemHideEmulation.js include.prelo ad.js |
| 27 document_end = include.postload.js | 27 document_end = include.postload.js |
| 28 | 28 |
| 29 [mapping] | 29 [mapping] |
| 30 cssProperties.js = adblockpluscore/chrome/content/cssProperties.js | 30 core-common.js = adblockpluscore/lib/common.js |
|
kzar
2016/12/20 15:08:33
Is this line still required?
Felix Dahlke
2016/12/20 16:19:03
Done.
| |
| 31 ext/content.js = chrome/ext/content.js | 31 ext/content.js = chrome/ext/content.js |
| 32 ext/popup.js = chrome/ext/popup.js | 32 ext/popup.js = chrome/ext/popup.js |
| 33 subscriptions.xml = adblockpluscore/chrome/content/ui/subscriptions.xml | 33 subscriptions.xml = adblockpluscore/chrome/content/ui/subscriptions.xml |
| 34 firstRun.html = adblockplusui/firstRun.html | 34 firstRun.html = adblockplusui/firstRun.html |
| 35 common.js = adblockplusui/common.js | 35 common.js = adblockplusui/common.js |
| 36 firstRun.js = adblockplusui/firstRun.js | 36 firstRun.js = adblockplusui/firstRun.js |
| 37 i18n.js = adblockplusui/i18n.js | 37 i18n.js = adblockplusui/i18n.js |
| 38 messageResponder.js = adblockplusui/messageResponder.js | 38 messageResponder.js = adblockplusui/messageResponder.js |
| 39 icons/detailed/abp-128.png = adblockplusui/skin/abp-128.png | 39 icons/detailed/abp-128.png = adblockplusui/skin/abp-128.png |
| 40 skin/common.css = adblockplusui/skin/common.css | 40 skin/common.css = adblockplusui/skin/common.css |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 65 lib/punycode.js | 65 lib/punycode.js |
| 66 lib/requestBlocker.js | 66 lib/requestBlocker.js |
| 67 lib/stats.js | 67 lib/stats.js |
| 68 lib/subscriptionInit.js | 68 lib/subscriptionInit.js |
| 69 lib/tldjs.js | 69 lib/tldjs.js |
| 70 lib/url.js | 70 lib/url.js |
| 71 lib/utils.js | 71 lib/utils.js |
| 72 lib/whitelisting.js | 72 lib/whitelisting.js |
| 73 adblockpluscore/lib/coreUtils.js | 73 adblockpluscore/lib/coreUtils.js |
| 74 adblockpluscore/lib/antiadblockInit.js | 74 adblockpluscore/lib/antiadblockInit.js |
| 75 adblockpluscore/lib/cssRules.js | 75 adblockpluscore/lib/common.js |
| 76 adblockpluscore/lib/downloader.js | 76 adblockpluscore/lib/downloader.js |
| 77 adblockpluscore/lib/elemHide.js | 77 adblockpluscore/lib/elemHide.js |
| 78 adblockpluscore/lib/elemHideEmulation.js | |
| 78 adblockpluscore/lib/events.js | 79 adblockpluscore/lib/events.js |
| 79 adblockpluscore/lib/filterClasses.js | 80 adblockpluscore/lib/filterClasses.js |
| 80 adblockpluscore/lib/filterListener.js | 81 adblockpluscore/lib/filterListener.js |
| 81 adblockpluscore/lib/filterNotifier.js | 82 adblockpluscore/lib/filterNotifier.js |
| 82 adblockpluscore/lib/filterStorage.js | 83 adblockpluscore/lib/filterStorage.js |
| 83 adblockpluscore/lib/jsbn.js | 84 adblockpluscore/lib/jsbn.js |
| 84 adblockpluscore/lib/matcher.js | 85 adblockpluscore/lib/matcher.js |
| 85 adblockpluscore/lib/notification.js | 86 adblockpluscore/lib/notification.js |
| 86 adblockpluscore/lib/rsa.js | 87 adblockpluscore/lib/rsa.js |
| 87 adblockpluscore/lib/rusha.js | 88 adblockpluscore/lib/rusha.js |
| 88 adblockpluscore/lib/subscriptionClasses.js | 89 adblockpluscore/lib/subscriptionClasses.js |
| 89 adblockpluscore/lib/synchronizer.js | 90 adblockpluscore/lib/synchronizer.js |
| 90 lib/adblockplus.js[module] = true | 91 lib/adblockplus.js[module] = true |
| 91 lib/adblockplus.js[autoload] = filterListener,synchronizer,requestBlocker,popupB locker,subscriptionInit,filterComposer,stats,uninstall,csp | 92 lib/adblockplus.js[autoload] = filterListener,synchronizer,requestBlocker,popupB locker,subscriptionInit,filterComposer,stats,uninstall,csp |
| 92 ext/common.js = ext/common.js | 93 ext/common.js = ext/common.js |
| 93 ext/background.js = ext/background.js | 94 ext/background.js = ext/background.js |
| 94 include.postload.js = subscriptionLink.postload.js composer.postload.js | 95 include.postload.js = subscriptionLink.postload.js composer.postload.js |
| 96 elemHideEmulation.js = adblockpluscore/lib/common.js adblockpluscore/chrome/cont ent/elemHideEmulation.js | |
| 95 | 97 |
| 96 [import_locales] | 98 [import_locales] |
| 97 adblockplus/chrome/locale/*/global.properties = subscription_invalid_location | 99 adblockplus/chrome/locale/*/global.properties = subscription_invalid_location |
| 98 remove_subscription_warning | 100 remove_subscription_warning |
| 99 notification_antiadblock_title | 101 notification_antiadblock_title |
| 100 notification_antiadblock_message | 102 notification_antiadblock_message |
| 101 filter_unknown_option | 103 filter_unknown_option |
| 102 filter_invalid_regexp | 104 filter_invalid_regexp |
| 103 filter_elemhide_duplicate_id | 105 filter_elemhide_duplicate_id |
| 104 filter_elemhide_nocriteria | 106 filter_elemhide_nocriteria |
| 105 filter_cssproperty_nodomain | 107 filter_elemhideemulation_nodomain |
| 106 adblockplus/chrome/locale/*/overlay.dtd = hideplaceholders.label | 108 adblockplus/chrome/locale/*/overlay.dtd = hideplaceholders.label |
| 107 notification.button.yes | 109 notification.button.yes |
| 108 notification.button.no | 110 notification.button.no |
| 109 notification.closing.button.hide | 111 notification.closing.button.hide |
| 110 notification.closing.button.optout | 112 notification.closing.button.optout |
| 111 shownotifications.label | 113 shownotifications.label |
| 112 adblockplus/chrome/locale/*/filters.dtd = subscription.lastDownload.inProgress | 114 adblockplus/chrome/locale/*/filters.dtd = subscription.lastDownload.inProgress |
| 113 subscription.lastDownload.invalidURL | 115 subscription.lastDownload.invalidURL |
| 114 subscription.lastDownload.connectionError | 116 subscription.lastDownload.connectionError |
| 115 subscription.lastDownload.invalidData | 117 subscription.lastDownload.invalidData |
| 116 subscription.lastDownload.checksumMismatch | 118 subscription.lastDownload.checksumMismatch |
| 117 subscription.enabled.label | 119 subscription.enabled.label |
| 118 subscription.delete.label | 120 subscription.delete.label |
| 119 addSubscription.label | 121 addSubscription.label |
| 120 addSubscriptionAdd.label | 122 addSubscriptionAdd.label |
| 121 addSubscriptionOther.label | 123 addSubscriptionOther.label |
| 122 acceptableAds2.label | 124 acceptableAds2.label |
| 123 viewList.label | 125 viewList.label |
| 124 readMore.label | 126 readMore.label |
| 125 adblockplus/chrome/locale/*/subscriptionSelection.dtd = location.label | 127 adblockplus/chrome/locale/*/subscriptionSelection.dtd = location.label |
| 126 title.label | 128 title.label |
| 127 adblockplus/chrome/locale/*/meta.properties = =name | 129 adblockplus/chrome/locale/*/meta.properties = =name |
| 128 adblockplusui/locale/*/firstRun.json = =* | 130 adblockplusui/locale/*/firstRun.json = =* |
| OLD | NEW |
« no previous file with comments
|
« include.preload.js ('k')
|
no next file »
|
no next file with comments »
