From fb62bbc29e437a3e52dbe59ed8a962cc86e789cf Mon Sep 17 00:00:00 2001 From: gorhill Date: Wed, 2 Jul 2014 12:02:29 -0400 Subject: [PATCH] this fixes #12, #37 --- 1p-filters.html | 4 +- 3p-filters.html | 4 +- _locales/de/messages.json | 20 +- _locales/en/messages.json | 20 +- _locales/fr/messages.json | 20 +- _locales/it/messages.json | 20 +- _locales/ru/messages.json | 20 +- _locales/zh_CN/messages.json | 20 +- about.html | 2 +- css/dashboard-common.css | 2 +- dashboard.html | 13 +- js/1p-filters.js | 38 ++- js/3p-filters.js | 66 ++--- js/about.js | 36 +-- js/abp-hide-filters.js | 30 +- js/background.js | 3 +- js/contentscript-end.js | 548 ++++++++++++++++++----------------- js/dashboard-common.js | 26 +- js/dashboard.js | 44 +-- js/i18n.js | 17 +- js/messaging-handlers.js | 81 +++++- js/pagestore.js | 10 +- js/popup.js | 83 +++--- js/settings.js | 12 +- js/stats.js | 180 ++++++++++++ js/traffic.js | 5 - js/udom.js | 503 ++++++++++++++++++++++++++++++++ js/utils.js | 23 +- lib/jquery-2.min.js | 4 - popup.html | 32 +- settings.html | 2 +- stats.html | 76 +++++ 32 files changed, 1453 insertions(+), 511 deletions(-) create mode 100644 js/stats.js create mode 100644 js/udom.js delete mode 100644 lib/jquery-2.min.js create mode 100644 stats.html diff --git a/1p-filters.html b/1p-filters.html index 99857d5d8..e474dbf60 100644 --- a/1p-filters.html +++ b/1p-filters.html @@ -2,7 +2,7 @@ -HTTP Switchboard — Ubiquitous rules +µBlock — Your filters + + + + + + +
+ + + +
TypeDomainBlocked URLFilter +
+ +
+ + + + + + + + +