From e8730f68798f173bd4d1c2f9b7ce02985e3fd771 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Fri, 1 Sep 2017 16:35:50 -0400 Subject: SpyBlock updated to 2.9.1 --- data/extensions/spyblock@gnu.org/bootstrap.js | 38 +- data/extensions/spyblock@gnu.org/chrome.manifest | 6 +- .../chrome/content/elemHideEmulation.js | 167 +++++ .../spyblock@gnu.org/chrome/content/errors.html | 111 --- .../spyblock@gnu.org/chrome/content/objtabs.css | 2 +- .../spyblock@gnu.org/chrome/content/ui/common.js | 154 ++++ .../spyblock@gnu.org/chrome/content/ui/composer.js | 54 +- .../chrome/content/ui/composer.xul | 2 +- .../chrome/content/ui/ext/common.js | 187 ++--- .../chrome/content/ui/ext/content.js | 116 ++-- .../chrome/content/ui/fennecSettings.xul | 4 +- .../chrome/content/ui/filters-backup.js | 115 +-- .../chrome/content/ui/filters-filteractions.js | 43 +- .../chrome/content/ui/filters-filterview.js | 114 +-- .../chrome/content/ui/filters-search.js | 226 +++--- .../content/ui/filters-subscriptionactions.js | 12 +- .../chrome/content/ui/filters-subscriptionview.js | 42 +- .../spyblock@gnu.org/chrome/content/ui/filters.js | 5 +- .../spyblock@gnu.org/chrome/content/ui/filters.xul | 31 +- .../chrome/content/ui/firstRun.html | 93 +-- .../spyblock@gnu.org/chrome/content/ui/firstRun.js | 212 +----- .../spyblock@gnu.org/chrome/content/ui/flasher.js | 108 --- .../spyblock@gnu.org/chrome/content/ui/i18n.js | 89 ++- .../spyblock@gnu.org/chrome/content/ui/overlay.xul | 26 +- .../chrome/content/ui/progressBar.js | 2 +- .../chrome/content/ui/progressBar.xul | 2 +- .../chrome/content/ui/sendReport.js | 340 +++++---- .../chrome/content/ui/sendReport.xul | 9 +- .../chrome/content/ui/settings.xul | 4 +- .../spyblock@gnu.org/chrome/content/ui/sidebar.js | 388 ++++++----- .../spyblock@gnu.org/chrome/content/ui/sidebar.xul | 7 +- .../chrome/content/ui/sidebarDetached.xul | 2 +- .../chrome/content/ui/skin/abb-logo.png | Bin 0 -> 1309 bytes .../chrome/content/ui/skin/abp-128.png | Bin 7303 -> 7768 bytes .../chrome/content/ui/skin/common.css | 59 ++ .../chrome/content/ui/skin/features/malware.png | Bin 3335 -> 0 bytes .../chrome/content/ui/skin/features/social.png | Bin 4260 -> 0 bytes .../chrome/content/ui/skin/features/tracking.png | Bin 3562 -> 0 bytes .../chrome/content/ui/skin/firstRun.css | 350 ++++------ .../chrome/content/ui/subscriptionSelection.js | 6 +- .../chrome/content/ui/subscriptionSelection.xul | 2 +- .../chrome/content/ui/subscriptions.xml | 53 +- .../spyblock@gnu.org/chrome/content/ui/utils.js | 28 +- .../chrome/locale/ar/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/ar/composer.dtd | 16 +- .../spyblock@gnu.org/chrome/locale/ar/filters.dtd | 96 +-- .../chrome/locale/ar/firstRun.properties | 3 + .../chrome/locale/ar/global.properties | 35 +- .../spyblock@gnu.org/chrome/locale/ar/overlay.dtd | 36 +- .../chrome/locale/ar/sendReport.dtd | 70 +- .../spyblock@gnu.org/chrome/locale/ar/sidebar.dtd | 12 +- .../chrome/locale/ar/subscriptionSelection.dtd | 6 +- .../chrome/locale/az/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/az/composer.dtd | 33 + .../spyblock@gnu.org/chrome/locale/az/filters.dtd | 78 +++ .../chrome/locale/az/firstRun.properties | 12 + .../chrome/locale/az/global.properties | 48 ++ .../spyblock@gnu.org/chrome/locale/az/overlay.dtd | 33 + .../chrome/locale/az/sendReport.dtd | 65 ++ .../spyblock@gnu.org/chrome/locale/az/sidebar.dtd | 35 + .../chrome/locale/az/subscriptionSelection.dtd | 12 + .../chrome/locale/bg/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/bg/composer.dtd | 4 +- .../spyblock@gnu.org/chrome/locale/bg/filters.dtd | 20 +- .../chrome/locale/bg/firstRun.properties | 3 + .../chrome/locale/bg/global.properties | 11 +- .../spyblock@gnu.org/chrome/locale/bg/overlay.dtd | 4 +- .../chrome/locale/bg/sendReport.dtd | 47 +- .../chrome/locale/bg/subscriptionSelection.dtd | 6 +- .../chrome/locale/bn-BD/common.properties | 4 + .../chrome/locale/bn-BD/composer.dtd | 33 + .../chrome/locale/bn-BD/filters.dtd | 78 +++ .../chrome/locale/bn-BD/firstRun.properties | 16 + .../chrome/locale/bn-BD/global.properties | 48 ++ .../chrome/locale/bn-BD/overlay.dtd | 33 + .../chrome/locale/bn-BD/sendReport.dtd | 66 ++ .../chrome/locale/bn-BD/sidebar.dtd | 35 + .../chrome/locale/bn-BD/subscriptionSelection.dtd | 12 + .../chrome/locale/ca/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/ca/filters.dtd | 22 +- .../chrome/locale/ca/firstRun.properties | 7 +- .../chrome/locale/ca/global.properties | 13 +- .../spyblock@gnu.org/chrome/locale/ca/overlay.dtd | 10 +- .../spyblock@gnu.org/chrome/locale/ca/sidebar.dtd | 2 +- .../chrome/locale/ca/subscriptionSelection.dtd | 4 +- .../chrome/locale/cs/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/cs/filters.dtd | 8 +- .../chrome/locale/cs/firstRun.properties | 3 + .../chrome/locale/cs/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/cs/overlay.dtd | 4 +- .../chrome/locale/cs/sendReport.dtd | 2 +- .../chrome/locale/cy/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/cy/filters.dtd | 6 + .../chrome/locale/cy/firstRun.properties | 3 + .../chrome/locale/cy/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/cy/overlay.dtd | 4 +- .../chrome/locale/da/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/da/filters.dtd | 6 + .../chrome/locale/da/firstRun.properties | 3 + .../chrome/locale/da/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/da/overlay.dtd | 4 +- .../chrome/locale/da/sendReport.dtd | 2 +- .../chrome/locale/de/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/de/composer.dtd | 6 +- .../spyblock@gnu.org/chrome/locale/de/filters.dtd | 8 +- .../chrome/locale/de/firstRun.properties | 3 + .../chrome/locale/de/global.properties | 9 +- .../spyblock@gnu.org/chrome/locale/de/overlay.dtd | 4 +- .../spyblock@gnu.org/chrome/locale/de/sidebar.dtd | 2 +- .../chrome/locale/de/subscriptionSelection.dtd | 6 +- .../chrome/locale/dsb/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/dsb/filters.dtd | 6 + .../chrome/locale/dsb/firstRun.properties | 3 + .../chrome/locale/dsb/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/dsb/overlay.dtd | 4 +- .../chrome/locale/el/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/el/filters.dtd | 6 + .../chrome/locale/el/firstRun.properties | 3 + .../chrome/locale/el/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/el/overlay.dtd | 4 +- .../chrome/locale/el/sendReport.dtd | 2 +- .../chrome/locale/en-GB/common.properties | 4 + .../chrome/locale/en-GB/filters.dtd | 6 + .../chrome/locale/en-GB/firstRun.properties | 21 +- .../chrome/locale/en-GB/global.properties | 7 + .../chrome/locale/en-GB/overlay.dtd | 4 +- .../chrome/locale/en-US/common.properties | 4 + .../chrome/locale/en-US/filters.dtd | 7 + .../chrome/locale/en-US/firstRun.properties | 14 +- .../chrome/locale/en-US/global.properties | 7 + .../chrome/locale/en-US/overlay.dtd | 4 +- .../chrome/locale/en-ZA/common.properties | 4 + .../chrome/locale/en-ZA/composer.dtd | 33 + .../chrome/locale/en-ZA/filters.dtd | 80 +++ .../chrome/locale/en-ZA/firstRun.properties | 12 + .../chrome/locale/en-ZA/global.properties | 48 ++ .../chrome/locale/en-ZA/overlay.dtd | 33 + .../chrome/locale/en-ZA/sendReport.dtd | 103 +++ .../chrome/locale/en-ZA/sidebar.dtd | 35 + .../chrome/locale/en-ZA/subscriptionSelection.dtd | 12 + .../chrome/locale/eo/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/eo/filters.dtd | 6 + .../chrome/locale/eo/firstRun.properties | 3 + .../chrome/locale/eo/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/eo/overlay.dtd | 4 +- .../chrome/locale/es-AR/common.properties | 4 + .../chrome/locale/es-AR/filters.dtd | 6 + .../chrome/locale/es-AR/firstRun.properties | 3 + .../chrome/locale/es-AR/global.properties | 7 + .../chrome/locale/es-AR/overlay.dtd | 4 +- .../chrome/locale/es-CL/common.properties | 4 + .../chrome/locale/es-CL/composer.dtd | 33 + .../chrome/locale/es-CL/filters.dtd | 78 +++ .../chrome/locale/es-CL/firstRun.properties | 23 + .../chrome/locale/es-CL/global.properties | 48 ++ .../chrome/locale/es-CL/overlay.dtd | 33 + .../chrome/locale/es-CL/sendReport.dtd | 67 ++ .../chrome/locale/es-CL/sidebar.dtd | 35 + .../chrome/locale/es-CL/subscriptionSelection.dtd | 12 + .../chrome/locale/es-ES/common.properties | 4 + .../chrome/locale/es-ES/filters.dtd | 6 + .../chrome/locale/es-ES/firstRun.properties | 5 +- .../chrome/locale/es-ES/global.properties | 7 + .../chrome/locale/es-ES/overlay.dtd | 8 +- .../chrome/locale/es-ES/sendReport.dtd | 2 +- .../chrome/locale/es-MX/common.properties | 4 + .../chrome/locale/es-MX/filters.dtd | 6 + .../chrome/locale/es-MX/firstRun.properties | 3 + .../chrome/locale/es-MX/global.properties | 29 +- .../chrome/locale/es-MX/overlay.dtd | 4 +- .../chrome/locale/es-MX/sendReport.dtd | 2 +- .../chrome/locale/es-MX/subscriptionSelection.dtd | 4 +- .../chrome/locale/et/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/et/filters.dtd | 6 + .../chrome/locale/et/firstRun.properties | 5 +- .../chrome/locale/et/global.properties | 11 +- .../spyblock@gnu.org/chrome/locale/et/overlay.dtd | 10 +- .../chrome/locale/eu/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/eu/filters.dtd | 10 +- .../chrome/locale/eu/firstRun.properties | 3 + .../chrome/locale/eu/global.properties | 9 +- .../spyblock@gnu.org/chrome/locale/eu/overlay.dtd | 4 +- .../chrome/locale/eu/sendReport.dtd | 6 +- .../chrome/locale/eu/subscriptionSelection.dtd | 2 +- .../chrome/locale/fa/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/fa/filters.dtd | 6 + .../chrome/locale/fa/firstRun.properties | 3 + .../chrome/locale/fa/global.properties | 11 +- .../spyblock@gnu.org/chrome/locale/fa/overlay.dtd | 4 +- .../chrome/locale/fi/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/fi/filters.dtd | 6 + .../chrome/locale/fi/firstRun.properties | 5 +- .../chrome/locale/fi/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/fi/overlay.dtd | 4 +- .../spyblock@gnu.org/chrome/locale/fi/sidebar.dtd | 46 +- .../chrome/locale/fr/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/fr/filters.dtd | 6 + .../chrome/locale/fr/firstRun.properties | 3 + .../chrome/locale/fr/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/fr/overlay.dtd | 4 +- .../chrome/locale/fy-NL/common.properties | 4 + .../chrome/locale/fy-NL/composer.dtd | 12 +- .../chrome/locale/fy-NL/filters.dtd | 6 + .../chrome/locale/fy-NL/firstRun.properties | 3 + .../chrome/locale/fy-NL/global.properties | 21 +- .../chrome/locale/fy-NL/overlay.dtd | 4 +- .../chrome/locale/gl/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/gl/filters.dtd | 18 +- .../chrome/locale/gl/firstRun.properties | 3 + .../chrome/locale/gl/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/gl/overlay.dtd | 4 +- .../spyblock@gnu.org/chrome/locale/gl/sidebar.dtd | 8 +- .../chrome/locale/he/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/he/filters.dtd | 6 + .../chrome/locale/he/firstRun.properties | 3 + .../chrome/locale/he/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/he/overlay.dtd | 4 +- .../chrome/locale/he/sendReport.dtd | 2 +- .../chrome/locale/hr/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/hr/filters.dtd | 6 + .../chrome/locale/hr/firstRun.properties | 3 + .../chrome/locale/hr/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/hr/overlay.dtd | 4 +- .../chrome/locale/hr/sendReport.dtd | 2 +- .../chrome/locale/hsb/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/hsb/filters.dtd | 6 + .../chrome/locale/hsb/firstRun.properties | 3 + .../chrome/locale/hsb/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/hsb/overlay.dtd | 4 +- .../chrome/locale/hu/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/hu/filters.dtd | 6 + .../chrome/locale/hu/firstRun.properties | 3 + .../chrome/locale/hu/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/hu/overlay.dtd | 4 +- .../chrome/locale/hu/sendReport.dtd | 2 +- .../chrome/locale/hy-AM/common.properties | 4 + .../chrome/locale/hy-AM/filters.dtd | 6 + .../chrome/locale/hy-AM/firstRun.properties | 3 + .../chrome/locale/hy-AM/global.properties | 7 + .../chrome/locale/hy-AM/overlay.dtd | 5 +- .../chrome/locale/id/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/id/composer.dtd | 6 +- .../spyblock@gnu.org/chrome/locale/id/filters.dtd | 6 + .../chrome/locale/id/firstRun.properties | 3 + .../chrome/locale/id/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/id/overlay.dtd | 4 +- .../chrome/locale/is/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/is/filters.dtd | 6 + .../chrome/locale/is/firstRun.properties | 3 + .../chrome/locale/is/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/is/overlay.dtd | 4 +- .../chrome/locale/it/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/it/composer.dtd | 8 +- .../spyblock@gnu.org/chrome/locale/it/filters.dtd | 6 + .../chrome/locale/it/firstRun.properties | 3 + .../chrome/locale/it/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/it/overlay.dtd | 6 +- .../chrome/locale/it/sendReport.dtd | 2 +- .../chrome/locale/ja/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/ja/filters.dtd | 6 + .../chrome/locale/ja/firstRun.properties | 5 +- .../chrome/locale/ja/global.properties | 13 +- .../spyblock@gnu.org/chrome/locale/ja/overlay.dtd | 4 +- .../chrome/locale/ja/sendReport.dtd | 2 +- .../chrome/locale/kk/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/kk/filters.dtd | 8 +- .../chrome/locale/kk/firstRun.properties | 5 +- .../chrome/locale/kk/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/kk/overlay.dtd | 4 +- .../chrome/locale/kk/sendReport.dtd | 4 +- .../chrome/locale/ko/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/ko/filters.dtd | 6 + .../chrome/locale/ko/firstRun.properties | 3 + .../chrome/locale/ko/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/ko/overlay.dtd | 4 +- .../chrome/locale/lt/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/lt/filters.dtd | 6 + .../chrome/locale/lt/firstRun.properties | 3 + .../chrome/locale/lt/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/lt/overlay.dtd | 4 +- .../chrome/locale/lt/sendReport.dtd | 2 +- .../chrome/locale/lv/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/lv/composer.dtd | 2 +- .../spyblock@gnu.org/chrome/locale/lv/filters.dtd | 8 +- .../chrome/locale/lv/firstRun.properties | 3 + .../chrome/locale/lv/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/lv/overlay.dtd | 4 +- .../chrome/locale/ms/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/ms/filters.dtd | 6 + .../chrome/locale/ms/firstRun.properties | 3 + .../chrome/locale/ms/global.properties | 9 +- .../spyblock@gnu.org/chrome/locale/ms/overlay.dtd | 4 +- .../chrome/locale/nb-NO/common.properties | 4 + .../chrome/locale/nb-NO/composer.dtd | 10 +- .../chrome/locale/nb-NO/filters.dtd | 14 +- .../chrome/locale/nb-NO/firstRun.properties | 3 + .../chrome/locale/nb-NO/global.properties | 11 +- .../chrome/locale/nb-NO/overlay.dtd | 12 +- .../chrome/locale/nb-NO/sendReport.dtd | 4 +- .../chrome/locale/nl/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/nl/composer.dtd | 10 +- .../spyblock@gnu.org/chrome/locale/nl/filters.dtd | 10 +- .../chrome/locale/nl/firstRun.properties | 25 +- .../chrome/locale/nl/global.properties | 15 +- .../spyblock@gnu.org/chrome/locale/nl/overlay.dtd | 4 +- .../chrome/locale/nl/sendReport.dtd | 4 +- .../spyblock@gnu.org/chrome/locale/nl/sidebar.dtd | 2 +- .../chrome/locale/nl/subscriptionSelection.dtd | 4 +- .../chrome/locale/pl/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/pl/filters.dtd | 8 +- .../chrome/locale/pl/firstRun.properties | 3 + .../chrome/locale/pl/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/pl/overlay.dtd | 4 +- .../chrome/locale/pl/sendReport.dtd | 6 +- .../chrome/locale/pt-BR/common.properties | 4 + .../chrome/locale/pt-BR/filters.dtd | 6 + .../chrome/locale/pt-BR/firstRun.properties | 3 + .../chrome/locale/pt-BR/global.properties | 7 + .../chrome/locale/pt-BR/overlay.dtd | 4 +- .../chrome/locale/pt-BR/subscriptionSelection.dtd | 2 +- .../chrome/locale/pt-PT/common.properties | 4 + .../chrome/locale/pt-PT/filters.dtd | 6 + .../chrome/locale/pt-PT/firstRun.properties | 3 + .../chrome/locale/pt-PT/global.properties | 7 + .../chrome/locale/pt-PT/overlay.dtd | 4 +- .../chrome/locale/ro/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/ro/composer.dtd | 2 +- .../spyblock@gnu.org/chrome/locale/ro/filters.dtd | 6 + .../chrome/locale/ro/firstRun.properties | 5 +- .../chrome/locale/ro/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/ro/overlay.dtd | 4 +- .../chrome/locale/ru/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/ru/composer.dtd | 4 +- .../spyblock@gnu.org/chrome/locale/ru/filters.dtd | 12 +- .../chrome/locale/ru/firstRun.properties | 3 + .../chrome/locale/ru/global.properties | 21 +- .../spyblock@gnu.org/chrome/locale/ru/overlay.dtd | 4 +- .../chrome/locale/ru/sendReport.dtd | 26 +- .../chrome/locale/sk/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/sk/filters.dtd | 6 + .../chrome/locale/sk/firstRun.properties | 5 +- .../chrome/locale/sk/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/sk/overlay.dtd | 12 +- .../chrome/locale/sk/sendReport.dtd | 2 +- .../chrome/locale/sl/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/sl/filters.dtd | 6 + .../chrome/locale/sl/firstRun.properties | 3 + .../chrome/locale/sl/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/sl/overlay.dtd | 4 +- .../chrome/locale/sq/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/sq/composer.dtd | 6 +- .../spyblock@gnu.org/chrome/locale/sq/filters.dtd | 6 + .../chrome/locale/sq/firstRun.properties | 3 + .../chrome/locale/sq/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/sq/overlay.dtd | 4 +- .../chrome/locale/sr/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/sr/filters.dtd | 14 +- .../chrome/locale/sr/firstRun.properties | 3 + .../chrome/locale/sr/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/sr/overlay.dtd | 4 +- .../chrome/locale/sr/sendReport.dtd | 70 +- .../spyblock@gnu.org/chrome/locale/sr/sidebar.dtd | 42 +- .../chrome/locale/sr/subscriptionSelection.dtd | 18 +- .../chrome/locale/sv-SE/common.properties | 4 + .../chrome/locale/sv-SE/composer.dtd | 4 +- .../chrome/locale/sv-SE/filters.dtd | 6 + .../chrome/locale/sv-SE/firstRun.properties | 3 + .../chrome/locale/sv-SE/global.properties | 7 + .../chrome/locale/sv-SE/overlay.dtd | 8 +- .../chrome/locale/th/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/th/filters.dtd | 6 + .../chrome/locale/th/firstRun.properties | 7 +- .../chrome/locale/th/global.properties | 11 +- .../spyblock@gnu.org/chrome/locale/th/overlay.dtd | 10 +- .../chrome/locale/th/sendReport.dtd | 10 +- .../chrome/locale/tr/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/tr/filters.dtd | 6 + .../chrome/locale/tr/firstRun.properties | 3 + .../chrome/locale/tr/global.properties | 21 +- .../spyblock@gnu.org/chrome/locale/tr/overlay.dtd | 4 +- .../chrome/locale/tr/sendReport.dtd | 8 +- .../chrome/locale/uk/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/uk/composer.dtd | 18 +- .../spyblock@gnu.org/chrome/locale/uk/filters.dtd | 6 + .../chrome/locale/uk/firstRun.properties | 3 + .../chrome/locale/uk/global.properties | 7 + .../spyblock@gnu.org/chrome/locale/uk/overlay.dtd | 4 +- .../spyblock@gnu.org/chrome/locale/uk/sidebar.dtd | 6 +- .../chrome/locale/vi/common.properties | 4 + .../spyblock@gnu.org/chrome/locale/vi/filters.dtd | 30 +- .../chrome/locale/vi/firstRun.properties | 3 + .../chrome/locale/vi/global.properties | 9 +- .../spyblock@gnu.org/chrome/locale/vi/overlay.dtd | 4 +- .../chrome/locale/zh-CN/common.properties | 4 + .../chrome/locale/zh-CN/filters.dtd | 6 + .../chrome/locale/zh-CN/firstRun.properties | 3 + .../chrome/locale/zh-CN/global.properties | 9 +- .../chrome/locale/zh-CN/overlay.dtd | 6 +- .../chrome/locale/zh-CN/sidebar.dtd | 2 +- .../chrome/locale/zh-TW/common.properties | 4 + .../chrome/locale/zh-TW/filters.dtd | 6 + .../chrome/locale/zh-TW/firstRun.properties | 3 + .../chrome/locale/zh-TW/global.properties | 7 + .../chrome/locale/zh-TW/overlay.dtd | 4 +- .../spyblock@gnu.org/chrome/skin/abp-status-16.png | Bin 1376 -> 737 bytes .../spyblock@gnu.org/chrome/skin/abp-status-32.png | Bin 2906 -> 1313 bytes .../spyblock@gnu.org/chrome/skin/abp-status-48.png | Bin 0 -> 1886 bytes .../spyblock@gnu.org/chrome/skin/abp-status-64.png | Bin 0 -> 2691 bytes .../spyblock@gnu.org/chrome/skin/abp-status.png | Bin 2278 -> 997 bytes .../spyblock@gnu.org/chrome/skin/composer.css | 2 +- .../spyblock@gnu.org/chrome/skin/filters.css | 62 +- .../spyblock@gnu.org/chrome/skin/overlay.css | 116 +++- .../spyblock@gnu.org/chrome/skin/sendReport.css | 12 +- .../spyblock@gnu.org/chrome/skin/sidebar.css | 2 +- .../chrome/skin/subscriptionSelection.css | 2 +- data/extensions/spyblock@gnu.org/defaults/prefs.js | 39 -- data/extensions/spyblock@gnu.org/icon.png | Bin 3040 -> 2600 bytes data/extensions/spyblock@gnu.org/icon64.png | Bin 4177 -> 3439 bytes data/extensions/spyblock@gnu.org/install.rdf | 36 +- data/extensions/spyblock@gnu.org/lib/Public.jsm | 2 +- .../spyblock@gnu.org/lib/antiadblockInit.js | 59 +- data/extensions/spyblock@gnu.org/lib/appSupport.js | 121 +--- .../spyblock@gnu.org/lib/child/bootstrap.js | 97 +++ .../spyblock@gnu.org/lib/child/contentPolicy.js | 518 ++++++++++++++ .../spyblock@gnu.org/lib/child/contextMenu.js | 137 ++++ .../spyblock@gnu.org/lib/child/dataCollector.js | 108 +++ .../spyblock@gnu.org/lib/child/elemHide.js | 403 +++++++++++ .../lib/child/elemHideEmulation.js | 118 ++++ .../spyblock@gnu.org/lib/child/flasher.js | 99 +++ data/extensions/spyblock@gnu.org/lib/child/main.js | 31 + .../spyblock@gnu.org/lib/child/objectTabs.js | 405 +++++++++++ .../spyblock@gnu.org/lib/child/requestNotifier.js | 444 ++++++++++++ .../spyblock@gnu.org/lib/child/subscribeLinks.js | 118 ++++ .../extensions/spyblock@gnu.org/lib/child/utils.js | 141 ++++ data/extensions/spyblock@gnu.org/lib/common.js | 53 ++ .../spyblock@gnu.org/lib/contentPolicy.js | 772 ++++++--------------- data/extensions/spyblock@gnu.org/lib/coreUtils.js | 36 + .../spyblock@gnu.org/lib/customizableUI.js | 4 +- data/extensions/spyblock@gnu.org/lib/downloader.js | 165 +++-- data/extensions/spyblock@gnu.org/lib/elemHide.js | 472 ++++++------- .../spyblock@gnu.org/lib/elemHideEmulation.js | 81 +++ data/extensions/spyblock@gnu.org/lib/elemHideFF.js | 106 +++ .../lib/elemHideHitRegistration.js | 164 ----- data/extensions/spyblock@gnu.org/lib/events.js | 106 +++ .../spyblock@gnu.org/lib/ext_background.js | 57 +- data/extensions/spyblock@gnu.org/lib/ext_common.js | 187 ++--- .../spyblock@gnu.org/lib/filterClasses.js | 573 ++++++++------- .../spyblock@gnu.org/lib/filterListener.js | 306 ++++---- .../spyblock@gnu.org/lib/filterNotifier.js | 55 +- .../spyblock@gnu.org/lib/filterStorage.js | 734 +++++++++----------- data/extensions/spyblock@gnu.org/lib/io.js | 465 ++++++------- .../extensions/spyblock@gnu.org/lib/keySelector.js | 40 +- data/extensions/spyblock@gnu.org/lib/legacyIO.js | 335 +++++++++ data/extensions/spyblock@gnu.org/lib/main.js | 23 +- data/extensions/spyblock@gnu.org/lib/matcher.js | 173 +++-- .../spyblock@gnu.org/lib/messageResponder.js | 515 ++++++++++---- data/extensions/spyblock@gnu.org/lib/messaging.js | 316 +++++++++ .../spyblock@gnu.org/lib/notification.js | 294 +++++--- data/extensions/spyblock@gnu.org/lib/objectTabs.js | 524 ++------------ data/extensions/spyblock@gnu.org/lib/prefs.js | 115 +-- .../spyblock@gnu.org/lib/requestNotifier.js | 400 +++-------- .../spyblock@gnu.org/lib/subscriptionClasses.js | 265 ++++--- data/extensions/spyblock@gnu.org/lib/sync.js | 2 +- .../spyblock@gnu.org/lib/synchronizer.js | 168 +++-- data/extensions/spyblock@gnu.org/lib/ui.js | 494 ++++++------- data/extensions/spyblock@gnu.org/lib/utils.js | 59 +- .../spyblock@gnu.org/lib/whitelisting.js | 46 ++ .../spyblock@gnu.org/webextension/.eslintrc.json | 7 + .../spyblock@gnu.org/webextension/background.js | 41 ++ .../extensions/spyblock@gnu.org/webextension/io.js | 109 +++ .../spyblock@gnu.org/webextension/manifest.json | 9 + 471 files changed, 11919 insertions(+), 6319 deletions(-) create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/elemHideEmulation.js delete mode 100644 data/extensions/spyblock@gnu.org/chrome/content/errors.html create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/common.js delete mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/flasher.js create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/abb-logo.png create mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/common.css delete mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/features/malware.png delete mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/features/social.png delete mode 100644 data/extensions/spyblock@gnu.org/chrome/content/ui/skin/features/tracking.png create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/ar/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/az/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/az/composer.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/az/filters.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/az/firstRun.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/az/global.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/az/overlay.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/az/sendReport.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/az/sidebar.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/az/subscriptionSelection.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/bg/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/bn-BD/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/bn-BD/composer.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/bn-BD/filters.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/bn-BD/firstRun.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/bn-BD/global.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/bn-BD/overlay.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/bn-BD/sendReport.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/bn-BD/sidebar.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/bn-BD/subscriptionSelection.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/ca/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/cs/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/cy/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/da/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/de/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/dsb/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/el/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/en-GB/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/en-US/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/en-ZA/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/en-ZA/composer.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/en-ZA/filters.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/en-ZA/firstRun.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/en-ZA/global.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/en-ZA/overlay.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/en-ZA/sendReport.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/en-ZA/sidebar.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/en-ZA/subscriptionSelection.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/eo/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/es-AR/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/es-CL/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/es-CL/composer.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/es-CL/filters.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/es-CL/firstRun.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/es-CL/global.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/es-CL/overlay.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/es-CL/sendReport.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/es-CL/sidebar.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/es-CL/subscriptionSelection.dtd create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/es-ES/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/es-MX/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/et/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/eu/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/fa/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/fi/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/fr/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/fy-NL/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/gl/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/he/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/hr/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/hsb/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/hu/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/hy-AM/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/id/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/is/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/it/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/ja/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/kk/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/ko/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/lt/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/lv/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/ms/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/nb-NO/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/nl/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/pl/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/pt-BR/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/pt-PT/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/ro/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/ru/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/sk/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/sl/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/sq/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/sr/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/sv-SE/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/th/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/tr/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/uk/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/vi/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/zh-CN/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/locale/zh-TW/common.properties create mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/abp-status-48.png create mode 100644 data/extensions/spyblock@gnu.org/chrome/skin/abp-status-64.png delete mode 100644 data/extensions/spyblock@gnu.org/defaults/prefs.js create mode 100644 data/extensions/spyblock@gnu.org/lib/child/bootstrap.js create mode 100644 data/extensions/spyblock@gnu.org/lib/child/contentPolicy.js create mode 100644 data/extensions/spyblock@gnu.org/lib/child/contextMenu.js create mode 100644 data/extensions/spyblock@gnu.org/lib/child/dataCollector.js create mode 100644 data/extensions/spyblock@gnu.org/lib/child/elemHide.js create mode 100644 data/extensions/spyblock@gnu.org/lib/child/elemHideEmulation.js create mode 100644 data/extensions/spyblock@gnu.org/lib/child/flasher.js create mode 100644 data/extensions/spyblock@gnu.org/lib/child/main.js create mode 100644 data/extensions/spyblock@gnu.org/lib/child/objectTabs.js create mode 100644 data/extensions/spyblock@gnu.org/lib/child/requestNotifier.js create mode 100644 data/extensions/spyblock@gnu.org/lib/child/subscribeLinks.js create mode 100644 data/extensions/spyblock@gnu.org/lib/child/utils.js create mode 100644 data/extensions/spyblock@gnu.org/lib/common.js create mode 100644 data/extensions/spyblock@gnu.org/lib/coreUtils.js create mode 100644 data/extensions/spyblock@gnu.org/lib/elemHideEmulation.js create mode 100644 data/extensions/spyblock@gnu.org/lib/elemHideFF.js delete mode 100644 data/extensions/spyblock@gnu.org/lib/elemHideHitRegistration.js create mode 100644 data/extensions/spyblock@gnu.org/lib/events.js create mode 100644 data/extensions/spyblock@gnu.org/lib/legacyIO.js create mode 100644 data/extensions/spyblock@gnu.org/lib/messaging.js create mode 100644 data/extensions/spyblock@gnu.org/lib/whitelisting.js create mode 100644 data/extensions/spyblock@gnu.org/webextension/.eslintrc.json create mode 100644 data/extensions/spyblock@gnu.org/webextension/background.js create mode 100644 data/extensions/spyblock@gnu.org/webextension/io.js create mode 100644 data/extensions/spyblock@gnu.org/webextension/manifest.json diff --git a/data/extensions/spyblock@gnu.org/bootstrap.js b/data/extensions/spyblock@gnu.org/bootstrap.js index 29c1b77..09aa4fe 100644 --- a/data/extensions/spyblock@gnu.org/bootstrap.js +++ b/data/extensions/spyblock@gnu.org/bootstrap.js @@ -7,8 +7,10 @@ const Ci = Components.interfaces; const Cr = Components.results; const Cu = Components.utils; -let {Services, atob, btoa, File, TextDecoder, TextEncoder} = Cu.import("resource://gre/modules/Services.jsm", null); -let XMLHttpRequest = Components.Constructor("@mozilla.org/xmlextras/xmlhttprequest;1", "nsIXMLHttpRequest"); +let {Services} = Cu.import("resource://gre/modules/Services.jsm", {}); + +Cu.importGlobalProperties(["atob", "btoa", "File", "URL", + "TextDecoder", "TextEncoder", "XMLHttpRequest"]); let addonData = null; @@ -16,7 +18,18 @@ function startup(params, reason) { addonData = params; Services.obs.addObserver(RequireObserver, "adblockplus-require", true); - onShutdown.add(function() Services.obs.removeObserver(RequireObserver, "adblockplus-require")); + onShutdown.add(function() + { + Services.obs.removeObserver(RequireObserver, "adblockplus-require"); + }); + let port = params.webExtension.startup().then(({browser}) => + { + return new Promise((resolve, reject) => + { + browser.runtime.onConnect.addListener(resolve); + }); + }); + require.scopes.webextension = {exports: port}; require("main"); } @@ -100,7 +113,7 @@ function require(module) { if (module == "info") { - let applications = {"{a23983c0-fd0e-11dc-95ff-0800200c9a66}": "fennec", "toolkit@mozilla.org": "toolkit", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}": "firefox", "dlm@emusic.com": "emusic", "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}": "seamonkey", "{aa3c5121-dab2-40e2-81ca-7ea25febc110}": "fennec2", "{a79fe89b-6662-4ff4-8e88-09950ad4dfde}": "conkeror", "{aa5ca914-c309-495d-91cf-3141bbb04115}": "midbrowser", "songbird@songbirdnest.com": "songbird", "prism@developer.mozilla.org": "prism", "{3550f703-e582-4d05-9a08-453d09bdfdc6}": "thunderbird"}; + let applications = {"{a23983c0-fd0e-11dc-95ff-0800200c9a66}": "fennec", "toolkit@mozilla.org": "toolkit", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}": "firefox", "dlm@emusic.com": "emusic", "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}": "seamonkey", "{aa3c5121-dab2-40e2-81ca-7ea25febc110}": "fennec2", "{a79fe89b-6662-4ff4-8e88-09950ad4dfde}": "conkeror", "{aa5ca914-c309-495d-91cf-3141bbb04115}": "midbrowser", "songbird@songbirdnest.com": "songbird", "{55aba3ac-94d3-41a8-9e25-5c21fe874539}": "adblockbrowser", "prism@developer.mozilla.org": "prism", "{3550f703-e582-4d05-9a08-453d09bdfdc6}": "thunderbird"}; let appInfo = Services.appinfo; scopes[module] = {}; @@ -120,18 +133,10 @@ function require(module) { let url = addonData.resourceURI.spec + "lib/" + module + ".js"; scopes[module] = { - Cc: Cc, - Ci: Ci, - Cr: Cr, - Cu: Cu, - atob: atob, - btoa: btoa, - File: File, - require: require, - - onShutdown: onShutdown, + Cc, Ci, Cr, Cu, atob, btoa, File, URL, TextDecoder, TextEncoder, + XMLHttpRequest, require, - XMLHttpRequest: XMLHttpRequest, + onShutdown, exports: {}}; Services.scriptloader.loadSubScript(url, scopes[module]); @@ -139,7 +144,8 @@ function require(module) } return scopes[module].exports; } -require.scopes = {__proto__: null}; +require.scopes = Object.create(null); +require.scopes["prefs.json"] = {exports: {"defaults": {"subscriptions_fallbackerrors": 5, "subscriptions_fallbackurl": "https://adblockplus.org/getSubscription?version=%VERSION%&url=%SUBSCRIPTION%&downloadURL=%URL%&error=%ERROR%&channelStatus=%CHANNELSTATUS%&responseStatus=%RESPONSESTATUS%", "subscriptions_autoupdate": true, "clearStatsOnHistoryPurge": true, "previewimages": true, "defaultstatusbaraction": 0, "notificationurl": "https://notification.adblockplus.org/notification.json", "notifications_showui": false, "report_submiturl": "https://reports.adblockplus.org/submitReport?version=1&guid=%GUID%&lang=%LANG%", "showinstatusbar": false, "patternsbackupinterval": 24, "sendReport_key": "", "enable_key": "", "currentVersion": "0.0", "detachsidebar": false, "blockableItemsSize": {"width": 200, "height": 200}, "savestats": false, "sidebar_key": "Accel Shift V, Accel Shift U", "notifications_ignoredcategories": [], "filters_key": "Accel Shift E, Accel Shift F, Accel Shift O", "frameobjects": true, "whitelistschemes": "about chrome file irc moz-extension moz-safe-about news resource snews x-jsd addbook cid imap mailbox nntp pop data javascript moz-icon", "fastcollapse": false, "subscriptions_exceptionsurl": "https://easylist-downloads.adblockplus.org/exceptionrules.txt", "subscriptions_antiadblockurl": "https://easylist-downloads.adblockplus.org/antiadblockfilters.txt", "hideContributeButton": false, "flash_scrolltoitem": true, "subscriptions_exceptionscheckbox": true, "recentReports": [], "suppress_first_run_page": false, "enabled": true, "notificationdata": {}, "subscriptions_listurl": "https://adblockplus.org/subscriptions2.xml", "patternsbackups": 5, "composer_default": 2, "documentation_link": "https://adblockplus.org/redirect?link=%LINK%&lang=%LANG%", "defaulttoolbaraction": 0}, "preconfigurable": ["suppress_first_run_page"]}}; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); let RequireObserver = diff --git a/data/extensions/spyblock@gnu.org/chrome.manifest b/data/extensions/spyblock@gnu.org/chrome.manifest index 0b1b0e7..5ac3f07 100644 --- a/data/extensions/spyblock@gnu.org/chrome.manifest +++ b/data/extensions/spyblock@gnu.org/chrome.manifest @@ -2,7 +2,9 @@ content adblockplus chrome/content/ skin adblockplus classic/1.0 chrome/skin/ locale adblockplus en-US chrome/locale/en-US/ locale adblockplus ar chrome/locale/ar/ +locale adblockplus az chrome/locale/az/ locale adblockplus bg chrome/locale/bg/ +locale adblockplus bn-BD chrome/locale/bn-BD/ locale adblockplus ca chrome/locale/ca/ locale adblockplus cs chrome/locale/cs/ locale adblockplus cy chrome/locale/cy/ @@ -11,8 +13,10 @@ locale adblockplus de chrome/locale/de/ locale adblockplus dsb chrome/locale/dsb/ locale adblockplus el chrome/locale/el/ locale adblockplus en-GB chrome/locale/en-GB/ +locale adblockplus en-ZA chrome/locale/en-ZA/ locale adblockplus eo chrome/locale/eo/ locale adblockplus es-AR chrome/locale/es-AR/ +locale adblockplus es-CL chrome/locale/es-CL/ locale adblockplus es-ES chrome/locale/es-ES/ locale adblockplus es-MX chrome/locale/es-MX/ locale adblockplus et chrome/locale/et/ @@ -56,4 +60,4 @@ locale adblockplus zh-CN chrome/locale/zh-CN/ locale adblockplus zh-TW chrome/locale/zh-TW/ # fennec settings -override chrome://adblockplus/content/ui/settings.xul chrome://adblockplus/content/ui/fennecSettings.xul application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} +override chrome://adblockplus/content/ui/settings.xul chrome://adblockplus/content/ui/fennecSettings.xul application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={55aba3ac-94d3-41a8-9e25-5c21fe874539} diff --git a/data/extensions/spyblock@gnu.org/chrome/content/elemHideEmulation.js b/data/extensions/spyblock@gnu.org/chrome/content/elemHideEmulation.js new file mode 100644 index 0000000..ff824ae --- /dev/null +++ b/data/extensions/spyblock@gnu.org/chrome/content/elemHideEmulation.js @@ -0,0 +1,167 @@ +// We are currently limited to ECMAScript 5 in this file, because it is being +// used in the browser tests. See https://issues.adblockplus.org/ticket/4796 + +var propertySelectorRegExp = /\[\-abp\-properties=(["'])([^"']+)\1\]/; + +function splitSelector(selector) +{ + if (selector.indexOf(",") == -1) + return [selector]; + + var selectors = []; + var start = 0; + var level = 0; + var sep = ""; + + for (var i = 0; i < selector.length; i++) + { + var chr = selector[i]; + + if (chr == "\\") // ignore escaped characters + i++; + else if (chr == sep) // don't split within quoted text + sep = ""; // e.g. [attr=","] + else if (sep == "") + { + if (chr == '"' || chr == "'") + sep = chr; + else if (chr == "(") // don't split between parentheses + level++; // e.g. :matches(div,span) + else if (chr == ")") + level = Math.max(0, level - 1); + else if (chr == "," && level == 0) + { + selectors.push(selector.substring(start, i)); + start = i + 1; + } + } + } + + selectors.push(selector.substring(start)); + return selectors; +} + +function ElemHideEmulation(window, getFiltersFunc, addSelectorsFunc) +{ + this.window = window; + this.getFiltersFunc = getFiltersFunc; + this.addSelectorsFunc = addSelectorsFunc; +} + +ElemHideEmulation.prototype = { + stringifyStyle: function(style) + { + var styles = []; + for (var i = 0; i < style.length; i++) + { + var property = style.item(i); + var value = style.getPropertyValue(property); + var priority = style.getPropertyPriority(property); + styles.push(property + ": " + value + (priority ? " !" + priority : "") + ";"); + } + styles.sort(); + return styles.join(" "); + }, + + isSameOrigin: function(stylesheet) + { + try + { + return new URL(stylesheet.href).origin == this.window.location.origin; + } + catch (e) + { + // Invalid URL, assume that it is first-party. + return true; + } + }, + + findSelectors: function(stylesheet, selectors, filters) + { + // Explicitly ignore third-party stylesheets to ensure consistent behavior + // between Firefox and Chrome. + if (!this.isSameOrigin(stylesheet)) + return; + + var rules = stylesheet.cssRules; + if (!rules) + return; + + for (var i = 0; i < rules.length; i++) + { + var rule = rules[i]; + if (rule.type != rule.STYLE_RULE) + continue; + + var style = this.stringifyStyle(rule.style); + for (var j = 0; j < this.patterns.length; j++) + { + var pattern = this.patterns[j]; + if (pattern.regexp.test(style)) + { + var subSelectors = splitSelector(rule.selectorText); + for (var k = 0; k < subSelectors.length; k++) + { + var subSelector = subSelectors[k]; + selectors.push(pattern.prefix + subSelector + pattern.suffix); + filters.push(pattern.text); + } + } + } + } + }, + + addSelectors: function(stylesheets) + { + var selectors = []; + var filters = []; + for (var i = 0; i < stylesheets.length; i++) + this.findSelectors(stylesheets[i], selectors, filters); + this.addSelectorsFunc(selectors, filters); + }, + + onLoad: function(event) + { + var stylesheet = event.target.sheet; + if (stylesheet) + this.addSelectors([stylesheet]); + }, + + apply: function() + { + this.getFiltersFunc(function(patterns) + { + this.patterns = []; + for (var i = 0; i < patterns.length; i++) + { + var pattern = patterns[i]; + var match = propertySelectorRegExp.exec(pattern.selector); + if (!match) + continue; + + var propertyExpression = match[2]; + var regexpString; + if (propertyExpression.length >= 2 && propertyExpression[0] == "/" && + propertyExpression[propertyExpression.length - 1] == "/") + regexpString = propertyExpression.slice(1, -1) + .replace("\\x7B ", "{").replace("\\x7D ", "}"); + else + regexpString = filterToRegExp(propertyExpression); + + this.patterns.push({ + text: pattern.text, + regexp: new RegExp(regexpString, "i"), + prefix: pattern.selector.substr(0, match.index), + suffix: pattern.selector.substr(match.index + match[0].length) + }); + } + + if (this.patterns.length > 0) + { + var document = this.window.document; + this.addSelectors(document.styleSheets); + document.addEventListener("load", this.onLoad.bind(this), true); + } + }.bind(this)); + } +}; diff --git a/data/extensions/spyblock@gnu.org/chrome/content/errors.html b/data/extensions/spyblock@gnu.org/chrome/content/errors.html deleted file mode 100644 index 24e05a5..0000000 --- a/data/extensions/spyblock@gnu.org/chrome/content/errors.html +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - Adblock Plus Errors - - - - - - - - - diff --git a/data/extensions/spyblock@gnu.org/chrome/content/objtabs.css b/data/extensions/spyblock@gnu.org/chrome/content/objtabs.css index d61f702..62ad04b 100644 --- a/data/extensions/spyblock@gnu.org/chrome/content/objtabs.css +++ b/data/extensions/spyblock@gnu.org/chrome/content/objtabs.css @@ -1,6 +1,6 @@ /* * This file is part of Adblock Plus , - * Copyright (C) 2006-2015 Eyeo GmbH + * Copyright (C) 2006-2017 eyeo GmbH * * Adblock Plus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3 as diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/common.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/common.js new file mode 100644 index 0000000..ec20ede --- /dev/null +++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/common.js @@ -0,0 +1,154 @@ +/* + * This file is part of Adblock Plus , + * Copyright (C) 2006-2017 eyeo GmbH + * + * Adblock Plus is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3 as + * published by the Free Software Foundation. + * + * Adblock Plus is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Adblock Plus. If not, see . + */ + +/* globals Components */ + +"use strict"; + +function E(id) +{ + return document.getElementById(id); +} + +function getDocLink(link, callback) +{ + ext.backgroundPage.sendMessage({ + type: "app.get", + what: "doclink", + link + }, callback); +} + +function checkShareResource(url, callback) +{ + ext.backgroundPage.sendMessage({ + type: "filters.blocked", + url, + requestType: "SCRIPT", + docDomain: "adblockplus.org", + thirdParty: true + }, callback); +} + +function openSharePopup(url) +{ + let glassPane = E("glass-pane"); + if (!glassPane) + { + glassPane = document.createElement("div"); + glassPane.setAttribute("id", "glass-pane"); + document.body.appendChild(glassPane); + } + + let iframe = E("share-popup"); + if (!iframe) + { + iframe = document.createElement("iframe"); + iframe.setAttribute("id", "share-popup"); + iframe.setAttribute("scrolling", "no"); + glassPane.appendChild(iframe); + } + + // Firefox 38+ no longer allows messaging using postMessage so we need + // to have a fake top level frame to avoid problems with scripts that try to + // communicate with the first-run page + let isGecko = ("Components" in window); + if (isGecko) + { + try + { + let Ci = Components.interfaces; + let docShell = iframe.contentWindow + .QueryInterface(Ci.nsIInterfaceRequestor) + .getInterface(Ci.nsIDocShell); + + if (typeof docShell.frameType != "undefined") + { + // Gecko 47+ + docShell.frameType = docShell.FRAME_TYPE_BROWSER; + } + else + { + // Legacy branch + docShell.setIsBrowserInsideApp( + Ci.nsIScriptSecurityManager.UNKNOWN_APP_ID + ); + } + } + catch (ex) + { + console.error(ex); + } + } + + let popupMessageReceived = false; + function resizePopup(width, height) + { + iframe.width = width; + iframe.height = height; + iframe.style.marginTop = -height / 2 + "px"; + iframe.style.marginLeft = -width / 2 + "px"; + popupMessageReceived = true; + window.removeEventListener("message", popupMessageListener); + } + + let popupMessageListener = function(event) + { + if (!/[./]adblockplus\.org$/.test(event.origin) || + !("width" in event.data) || !("height" in event.data)) + return; + + resizePopup(event.data.width, event.data.height); + }; + // Firefox requires last parameter to be true to be triggered by + // unprivileged pages + window.addEventListener("message", popupMessageListener, false, true); + + let popupLoadListener = function() + { + if (!popupMessageReceived && isGecko) + { + let rootElement = iframe.contentDocument.documentElement; + let {width, height} = rootElement.dataset; + if (width && height) + resizePopup(width, height); + } + + if (popupMessageReceived) + { + iframe.className = "visible"; + + let popupCloseListener = function() + { + iframe.className = glassPane.className = ""; + document.removeEventListener("click", popupCloseListener); + }; + document.addEventListener("click", popupCloseListener, false); + } + else + { + glassPane.className = ""; + window.removeEventListener("message", popupMessageListener); + } + + iframe.removeEventListener("load", popupLoadListener); + }; + iframe.addEventListener("load", popupLoadListener, false); + + iframe.src = url; + glassPane.className = "visible"; +} diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/composer.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/composer.js index 98a38aa..8170cee 100644 --- a/data/extensions/spyblock@gnu.org/chrome/content/ui/composer.js +++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/composer.js @@ -1,6 +1,6 @@ /* * This file is part of Adblock Plus , - * Copyright (C) 2006-2015 Eyeo GmbH + * Copyright (C) 2006-2017 eyeo GmbH * * Adblock Plus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3 as @@ -15,13 +15,14 @@ * along with Adblock Plus. If not, see . */ -let nodes = null; -let item = null; -let advancedMode = false; +var nodesID = null; +var item = null; +var advancedMode = false; function init() { - [nodes, item] = window.arguments; + [nodesID, item] = window.arguments; + window.addEventListener("unload", () => Policy.deleteNodes(nodesID)); E("filterType").value = (!item.filter || item.filter.disabled || item.filter instanceof WhitelistFilter ? "filterlist" : "whitelist"); E("customPattern").value = item.location; @@ -118,19 +119,8 @@ function init() else E("patternGroup").focus(); - let types = []; - for (let type in Policy.localizedDescr) - { - types.push(parseInt(type)); - } - types.sort(function(a, b) { - if (a < b) - return -1; - else if (a > b) - return 1; - else - return 0; - }); + let types = Array.from(new Set(Policy.contentTypes.values())); + types.sort(); let docDomain = item.docDomain; let thirdParty = item.thirdParty; @@ -145,24 +135,24 @@ function init() let typeGroup = E("typeGroup"); let defaultTypes = RegExpFilter.prototype.contentType & ~RegExpFilter.typeMap.DOCUMENT; - let isDefaultType = (RegExpFilter.typeMap[item.typeDescr] & defaultTypes) != 0; + let isDefaultType = (RegExpFilter.typeMap[item.type] & defaultTypes) != 0; for (let type of types) { - if (type == Policy.type.ELEMHIDE) + if (type == "ELEMHIDE" || type == "GENERICBLOCK" || type == "GENERICHIDE") continue; let typeNode = document.createElement("checkbox"); - typeNode.setAttribute("value", Policy.typeDescr[type].toLowerCase().replace(/\_/g, "-")); - typeNode.setAttribute("label", Policy.localizedDescr[type].toLowerCase()); + typeNode.setAttribute("value", type.toLowerCase().replace(/\_/g, "-")); + typeNode.setAttribute("label", Utils.getString("type_label_" + type.toLowerCase())); - let typeMask = RegExpFilter.typeMap[Policy.typeDescr[type]]; + let typeMask = RegExpFilter.typeMap[type]; typeNode._defaultType = (typeMask & defaultTypes) != 0; if ((isDefaultType && typeNode._defaultType) || (!isDefaultType && item.type == type)) typeNode.setAttribute("checked", "true"); if (item.type == type) typeNode.setAttribute("disabled", "true"); - typeNode.addEventListener("command", function() checkboxUpdated(this), false); + typeNode.addEventListener("command", () => checkboxUpdated(typeNode), false); typeGroup.appendChild(typeNode); } @@ -255,16 +245,16 @@ function updateFilter() if (options.length) { - options.sort(function(a, b) a[0] - b[0]); - filter += "$" + options.map(function(o) o[1]).join(","); + options.sort((a, b) => a[0] - b[0]); + filter += "$" + options.map(o => o[1]).join(","); } } else { let defaultTypes = RegExpFilter.prototype.contentType & ~RegExpFilter.typeMap.DOCUMENT; - let isDefaultType = (RegExpFilter.typeMap[item.typeDescr] & defaultTypes) != 0; + let isDefaultType = (RegExpFilter.typeMap[item.type] & defaultTypes) != 0; if (!isDefaultType) - filter += "$" + item.typeDescr.toLowerCase().replace(/\_/g, "-"); + filter += "$" + item.type.toLowerCase().replace(/\_/g, "-"); } filter = Filter.normalize(filter); @@ -279,7 +269,7 @@ function updateFilter() } E("shortpatternWarning").hidden = !isSlow; - E("matchWarning").hidden = compiledFilter instanceof RegExpFilter && compiledFilter.matches(item.location, item.typeDescr, item.docDomain, item.thirdParty); + E("matchWarning").hidden = compiledFilter instanceof RegExpFilter && compiledFilter.matches(item.location, RegExpFilter.typeMap[item.type], item.docDomain, item.thirdParty); E("filter").value = filter; } @@ -318,7 +308,7 @@ function updatePatternSelection() function testFilter(/**String*/ filter) /**Boolean*/ { - return RegExpFilter.fromText(filter + "$" + item.typeDescr).matches(item.location, item.typeDescr, item.docDomain, item.thirdParty); + return RegExpFilter.fromText(filter + "$" + item.type).matches(item.location, RegExpFilter.typeMap[item.type], item.docDomain, item.thirdParty); } let anchorStartCheckbox = E("anchorStart"); @@ -352,8 +342,8 @@ function addFilter() { FilterStorage.addFilter(filter); - if (nodes) - Policy.refilterNodes(nodes, item); + if (nodesID) + Policy.refilterNodes(nodesID, item); return true; } diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/composer.xul b/data/extensions/spyblock@gnu.org/chrome/content/ui/composer.xul index 66e64ef..2cf1502 100644 --- a/data/extensions/spyblock@gnu.org/chrome/content/ui/composer.xul +++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/composer.xul @@ -2,7 +2,7 @@ -