From b699b1ea0084b7007190b8bb14465d38ac43554a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Fuglede=20J=C3=B8rgensen?= Date: Sat, 27 Jun 2015 15:59:29 +0200 Subject: [PATCH 01/10] Include counter as ApplicableList method --- src/chrome/content/code/ApplicableList.js | 15 +++++++++++++++ src/chrome/content/toolbar_button.js | 15 ++------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/code/ApplicableList.js b/src/chrome/content/code/ApplicableList.js index 351530a90dee..e71619a2792f 100644 --- a/src/chrome/content/code/ApplicableList.js +++ b/src/chrome/content/code/ApplicableList.js @@ -204,6 +204,21 @@ ApplicableList.prototype = { }, + count_applied: function() { + var counter = 0; + for (var x in this.active) { + if (!(x in this.breaking)) { + ++counter; + } + } + for (var x in this.moot) { + if (!(x in this.active)) { + ++counter; + } + } + return counter; + }, + prepend_child: function(node) { this.menupopup.insertBefore(node, this.menupopup.firstChild); }, diff --git a/src/chrome/content/toolbar_button.js b/src/chrome/content/toolbar_button.js index 96b63d787c81..6e30658d6e91 100644 --- a/src/chrome/content/toolbar_button.js +++ b/src/chrome/content/toolbar_button.js @@ -191,19 +191,8 @@ httpsEverywhere.toolbarButton = { } // Make sure the list is up to date alist.populate_list(); - - var counter = 0; - for (var x in alist.active) { - if (!(x in alist.breaking)) { - ++counter; - } - } - for (var x in alist.moot) { - if (!(x in alist.active)) { - ++counter; - } - } - + var counter = alist.count_applied(); + toolbarbutton.setAttribute('rulesetsApplied', counter); HTTPSEverywhere.log(INFO, 'Setting icon counter to: ' + counter); }, From e58ecb051f50c01b4a23681f56851dacd9b82876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Fuglede=20J=C3=B8rgensen?= Date: Sat, 27 Jun 2015 17:39:09 +0200 Subject: [PATCH 02/10] Minor fixes + option to show total count of applicable rulesets --- src/chrome/content/code/ApplicableList.js | 6 ++- src/chrome/content/toolbar_button.js | 58 ++++++++++++++++++----- src/chrome/content/toolbar_button.xul | 2 + 3 files changed, 54 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/code/ApplicableList.js b/src/chrome/content/code/ApplicableList.js index e71619a2792f..d2dad5d9fe3c 100644 --- a/src/chrome/content/code/ApplicableList.js +++ b/src/chrome/content/code/ApplicableList.js @@ -28,7 +28,7 @@ ApplicableList.prototype = { empty: function() { // Empty everything, used when toggles occur in order to ensure that if - // the reload fails, the resulting list is not eroneous + // the reload fails, the resulting list is not erroneous this.active = {}; this.breaking = {}; this.inactive = {}; @@ -218,6 +218,10 @@ ApplicableList.prototype = { } return counter; }, + + count_all: function() { + return Object.keys(this.all).length; + }, prepend_child: function(node) { this.menupopup.insertBefore(node, this.menupopup.firstChild); diff --git a/src/chrome/content/toolbar_button.js b/src/chrome/content/toolbar_button.js index 6e30658d6e91..1b441f55f85c 100644 --- a/src/chrome/content/toolbar_button.js +++ b/src/chrome/content/toolbar_button.js @@ -37,9 +37,10 @@ if (!httpsEverywhere) { var httpsEverywhere = {}; } httpsEverywhere.toolbarButton = { /** - * Name of preference for determining whether to show ruleset counter. + * Names of preferences for determining whether to show ruleset counters. */ COUNTER_PREF: "extensions.https_everywhere.show_counter", + COUNTER_TOTAL_PREF: "extensions.https_everywhere.show_counter_total", /** * Name of preference for whether HTTP Nowhere is on. @@ -62,11 +63,17 @@ httpsEverywhere.toolbarButton = { var tb = httpsEverywhere.toolbarButton; - // make sure the checkbox for showing counter is properly set + // make sure the checkbox for showing counters are properly set var showCounter = tb.shouldShowCounter(); var counterItem = document.getElementById('https-everywhere-counter-item'); if (counterItem) { - counterItem.setAttribute('checked', showCounter ? 'true' : 'false'); + counterItem.setAttribute('checked', showCounter); + } + var showCounterTotal = tb.shouldShowCounterTotal(); + var counterTotalItem = document.getElementById('https-everywhere-counter-total-item'); + if (counterTotalItem) { + counterTotalItem.setAttribute('checked', showCounterTotal); + counterTotalItem.setAttribute('disabled', !showCounter); } // make sure UI for HTTP Nowhere mode is properly set @@ -191,10 +198,14 @@ httpsEverywhere.toolbarButton = { } // Make sure the list is up to date alist.populate_list(); - var counter = alist.count_applied(); + var rulesetsApplied = alist.count_applied(); + var rulesetsTotal = alist.count_all(); - toolbarbutton.setAttribute('rulesetsApplied', counter); - HTTPSEverywhere.log(INFO, 'Setting icon counter to: ' + counter); + var includeTotals = httpsEverywhere.toolbarButton.shouldShowCounterTotal(); + var counterLabel = includeTotals ? rulesetsApplied + '/' + rulesetsTotal : rulesetsApplied; + + toolbarbutton.setAttribute('rulesetsApplied', counterLabel); + HTTPSEverywhere.log(INFO, 'Setting icon counter to: ' + counterLabel); }, /** @@ -213,6 +224,21 @@ httpsEverywhere.toolbarButton = { return !prefExists || sp.getBoolPref(tb.COUNTER_PREF); }, + /** + * Gets whether to show the total ruleset count of applicable rulesets. + * + * @return {boolean} + */ + shouldShowCounterTotal: function() { + var tb = httpsEverywhere.toolbarButton; + var sp = Services.prefs; + + var prefExists = sp.getPrefType(tb.COUNTER_TOTAL_PREF); + + // This time around, the default behavior is to not show the counter + return prefExists && sp.getBoolPref(tb.COUNTER_TOTAL_PREF); + }, + /** * Gets whether to show HTTP Nowhere UI. * @@ -225,19 +251,30 @@ httpsEverywhere.toolbarButton = { }, /** - * Toggles the user's preference for displaying the rulesets applied counter + * Toggles the user's preference for displaying the rulesets applied counters * and updates the UI. */ toggleShowCounter: function() { var tb = httpsEverywhere.toolbarButton; var sp = Services.prefs; - var showCounter = tb.shouldShowCounter(); - sp.setBoolPref(tb.COUNTER_PREF, !showCounter); + var showCounter = !tb.shouldShowCounter(); + sp.setBoolPref(tb.COUNTER_PREF, showCounter); + + var counterTotalItem = document.getElementById('https-everywhere-counter-total-item'); + counterTotalItem.setAttribute('disabled', !showCounter); tb.updateRulesetsApplied(); }, + toggleShowCounterTotal: function() { + var tb = httpsEverywhere.toolbarButton; + var sp = Services.prefs; + var showCounterTotal = !tb.shouldShowCounterTotal(); + sp.setBoolPref(tb.COUNTER_TOTAL_PREF, showCounterTotal); + tb.updateRulesetsApplied(); + }, + /** * Toggles whether HTTP Nowhere mode is active, updates the toolbar icon. */ @@ -248,8 +285,7 @@ httpsEverywhere.toolbarButton = { // Change icon color to red if HTTP nowhere is enabled var toolbarbutton = document.getElementById('https-everywhere-button'); - toolbarbutton.setAttribute('http_nowhere', - showHttpNowhere ? 'true' : 'false'); + toolbarbutton.setAttribute('http_nowhere', showHttpNowhere); reload_window(); } }; diff --git a/src/chrome/content/toolbar_button.xul b/src/chrome/content/toolbar_button.xul index c4e2f6b73e2b..ddf70c894c1d 100644 --- a/src/chrome/content/toolbar_button.xul +++ b/src/chrome/content/toolbar_button.xul @@ -48,6 +48,8 @@ + From 3a00d4784aa32a605acb94994f8cffa7f7870c81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Fuglede=20J=C3=B8rgensen?= Date: Mon, 29 Jun 2015 22:27:06 +0200 Subject: [PATCH 03/10] Added localisation for total ruleset count --- src/chrome/content/toolbar_button.xul | 2 +- src/chrome/locale/ar/https-everywhere.dtd | 1 + src/chrome/locale/bg/https-everywhere.dtd | 1 + src/chrome/locale/ca/https-everywhere.dtd | 1 + src/chrome/locale/cs/https-everywhere.dtd | 1 + src/chrome/locale/da/https-everywhere.dtd | 1 + src/chrome/locale/de/https-everywhere.dtd | 1 + src/chrome/locale/el/https-everywhere.dtd | 1 + src/chrome/locale/en/https-everywhere.dtd | 1 + src/chrome/locale/en_GB/https-everywhere.dtd | 1 + src/chrome/locale/es/https-everywhere.dtd | 1 + src/chrome/locale/et/https-everywhere.dtd | 1 + src/chrome/locale/eu/https-everywhere.dtd | 1 + src/chrome/locale/fa/https-everywhere.dtd | 1 + src/chrome/locale/fi/https-everywhere.dtd | 1 + src/chrome/locale/fo/https-everywhere.dtd | 1 + src/chrome/locale/fr/https-everywhere.dtd | 1 + src/chrome/locale/fr_CA/https-everywhere.dtd | 1 + src/chrome/locale/he/https-everywhere.dtd | 1 + src/chrome/locale/hr_HR/https-everywhere.dtd | 1 + src/chrome/locale/hu/https-everywhere.dtd | 1 + src/chrome/locale/it/https-everywhere.dtd | 1 + src/chrome/locale/ja/https-everywhere.dtd | 1 + src/chrome/locale/km/https-everywhere.dtd | 1 + src/chrome/locale/ko/https-everywhere.dtd | 1 + src/chrome/locale/lt/https-everywhere.dtd | 1 + src/chrome/locale/lv/https-everywhere.dtd | 1 + src/chrome/locale/ms_MY/https-everywhere.dtd | 1 + src/chrome/locale/nb/https-everywhere.dtd | 1 + src/chrome/locale/nl/https-everywhere.dtd | 1 + src/chrome/locale/pl/https-everywhere.dtd | 1 + src/chrome/locale/pt/https-everywhere.dtd | 1 + src/chrome/locale/pt_BR/https-everywhere.dtd | 1 + src/chrome/locale/ro/https-everywhere.dtd | 1 + src/chrome/locale/ru/https-everywhere.dtd | 1 + src/chrome/locale/si_LK/https-everywhere.dtd | 1 + src/chrome/locale/sk/https-everywhere.dtd | 1 + src/chrome/locale/sk_SK/https-everywhere.dtd | 1 + src/chrome/locale/sl/https-everywhere.dtd | 1 + src/chrome/locale/sl_SI/https-everywhere.dtd | 1 + src/chrome/locale/sq/https-everywhere.dtd | 1 + src/chrome/locale/sr/https-everywhere.dtd | 1 + src/chrome/locale/sv/https-everywhere.dtd | 1 + src/chrome/locale/th/https-everywhere.dtd | 1 + src/chrome/locale/tr/https-everywhere.dtd | 1 + src/chrome/locale/uk/https-everywhere.dtd | 1 + src/chrome/locale/zh-CN/https-everywhere.dtd | 1 + src/chrome/locale/zh_TW/https-everywhere.dtd | 1 + 48 files changed, 48 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/toolbar_button.xul b/src/chrome/content/toolbar_button.xul index ddf70c894c1d..19411378c96d 100644 --- a/src/chrome/content/toolbar_button.xul +++ b/src/chrome/content/toolbar_button.xul @@ -48,7 +48,7 @@ - diff --git a/src/chrome/locale/ar/https-everywhere.dtd b/src/chrome/locale/ar/https-everywhere.dtd index 4f9afe95c2e9..78e07695f433 100644 --- a/src/chrome/locale/ar/https-everywhere.dtd +++ b/src/chrome/locale/ar/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/bg/https-everywhere.dtd b/src/chrome/locale/bg/https-everywhere.dtd index 422c3cc85c06..a970962c0c4e 100644 --- a/src/chrome/locale/bg/https-everywhere.dtd +++ b/src/chrome/locale/bg/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/ca/https-everywhere.dtd b/src/chrome/locale/ca/https-everywhere.dtd index 12305237e3ba..a7d07295e670 100644 --- a/src/chrome/locale/ca/https-everywhere.dtd +++ b/src/chrome/locale/ca/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/cs/https-everywhere.dtd b/src/chrome/locale/cs/https-everywhere.dtd index 16666746b02d..2d5eef051324 100644 --- a/src/chrome/locale/cs/https-everywhere.dtd +++ b/src/chrome/locale/cs/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/da/https-everywhere.dtd b/src/chrome/locale/da/https-everywhere.dtd index 4c577dc70b04..b2fcfcd20013 100644 --- a/src/chrome/locale/da/https-everywhere.dtd +++ b/src/chrome/locale/da/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/de/https-everywhere.dtd b/src/chrome/locale/de/https-everywhere.dtd index df9dc6468d34..a7ac4a6c5d0c 100644 --- a/src/chrome/locale/de/https-everywhere.dtd +++ b/src/chrome/locale/de/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/el/https-everywhere.dtd b/src/chrome/locale/el/https-everywhere.dtd index 083797442c44..1a5a4ec07e5a 100644 --- a/src/chrome/locale/el/https-everywhere.dtd +++ b/src/chrome/locale/el/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/en/https-everywhere.dtd b/src/chrome/locale/en/https-everywhere.dtd index f98607c9504d..ac34adca90fe 100644 --- a/src/chrome/locale/en/https-everywhere.dtd +++ b/src/chrome/locale/en/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/en_GB/https-everywhere.dtd b/src/chrome/locale/en_GB/https-everywhere.dtd index f98607c9504d..ac34adca90fe 100644 --- a/src/chrome/locale/en_GB/https-everywhere.dtd +++ b/src/chrome/locale/en_GB/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/es/https-everywhere.dtd b/src/chrome/locale/es/https-everywhere.dtd index b7811d13fb26..af8c6c225ec8 100644 --- a/src/chrome/locale/es/https-everywhere.dtd +++ b/src/chrome/locale/es/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/et/https-everywhere.dtd b/src/chrome/locale/et/https-everywhere.dtd index 3c487bcd51d1..e99622647c56 100644 --- a/src/chrome/locale/et/https-everywhere.dtd +++ b/src/chrome/locale/et/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/eu/https-everywhere.dtd b/src/chrome/locale/eu/https-everywhere.dtd index 32a9f2bb2d73..816eb3d3e088 100644 --- a/src/chrome/locale/eu/https-everywhere.dtd +++ b/src/chrome/locale/eu/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/fa/https-everywhere.dtd b/src/chrome/locale/fa/https-everywhere.dtd index dd8aea197437..cbea6573e631 100644 --- a/src/chrome/locale/fa/https-everywhere.dtd +++ b/src/chrome/locale/fa/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/fi/https-everywhere.dtd b/src/chrome/locale/fi/https-everywhere.dtd index b1e1d7f95ac0..aa012e8d0c3b 100644 --- a/src/chrome/locale/fi/https-everywhere.dtd +++ b/src/chrome/locale/fi/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/fo/https-everywhere.dtd b/src/chrome/locale/fo/https-everywhere.dtd index d84301459512..0a5df82c76d9 100644 --- a/src/chrome/locale/fo/https-everywhere.dtd +++ b/src/chrome/locale/fo/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/fr/https-everywhere.dtd b/src/chrome/locale/fr/https-everywhere.dtd index a23011259bbe..af9341a0935b 100644 --- a/src/chrome/locale/fr/https-everywhere.dtd +++ b/src/chrome/locale/fr/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/fr_CA/https-everywhere.dtd b/src/chrome/locale/fr_CA/https-everywhere.dtd index ef7c689b07c9..2304cc16ae26 100644 --- a/src/chrome/locale/fr_CA/https-everywhere.dtd +++ b/src/chrome/locale/fr_CA/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/he/https-everywhere.dtd b/src/chrome/locale/he/https-everywhere.dtd index e78b68794c4b..eaac94a19c5c 100644 --- a/src/chrome/locale/he/https-everywhere.dtd +++ b/src/chrome/locale/he/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/hr_HR/https-everywhere.dtd b/src/chrome/locale/hr_HR/https-everywhere.dtd index 96903e6f1168..cbe457f76cc8 100644 --- a/src/chrome/locale/hr_HR/https-everywhere.dtd +++ b/src/chrome/locale/hr_HR/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/hu/https-everywhere.dtd b/src/chrome/locale/hu/https-everywhere.dtd index 0d4e21b83996..256bf4c7f2b9 100644 --- a/src/chrome/locale/hu/https-everywhere.dtd +++ b/src/chrome/locale/hu/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/it/https-everywhere.dtd b/src/chrome/locale/it/https-everywhere.dtd index c0edc2c8ec00..ef6d5144e2a6 100644 --- a/src/chrome/locale/it/https-everywhere.dtd +++ b/src/chrome/locale/it/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/ja/https-everywhere.dtd b/src/chrome/locale/ja/https-everywhere.dtd index 618ad78867f3..fb2b3187c5c0 100644 --- a/src/chrome/locale/ja/https-everywhere.dtd +++ b/src/chrome/locale/ja/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/km/https-everywhere.dtd b/src/chrome/locale/km/https-everywhere.dtd index e47cb9262a97..a4e16ac503f5 100644 --- a/src/chrome/locale/km/https-everywhere.dtd +++ b/src/chrome/locale/km/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/ko/https-everywhere.dtd b/src/chrome/locale/ko/https-everywhere.dtd index ce176de0b4da..1155df6785d1 100644 --- a/src/chrome/locale/ko/https-everywhere.dtd +++ b/src/chrome/locale/ko/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/lt/https-everywhere.dtd b/src/chrome/locale/lt/https-everywhere.dtd index d2fa071f42bd..e56b7472e6b6 100644 --- a/src/chrome/locale/lt/https-everywhere.dtd +++ b/src/chrome/locale/lt/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/lv/https-everywhere.dtd b/src/chrome/locale/lv/https-everywhere.dtd index 5e33d1841f44..12d7344572f1 100644 --- a/src/chrome/locale/lv/https-everywhere.dtd +++ b/src/chrome/locale/lv/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/ms_MY/https-everywhere.dtd b/src/chrome/locale/ms_MY/https-everywhere.dtd index 7ada73095cae..e5b99737262d 100644 --- a/src/chrome/locale/ms_MY/https-everywhere.dtd +++ b/src/chrome/locale/ms_MY/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/nb/https-everywhere.dtd b/src/chrome/locale/nb/https-everywhere.dtd index de1690a011ef..d966d1ca419c 100644 --- a/src/chrome/locale/nb/https-everywhere.dtd +++ b/src/chrome/locale/nb/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/nl/https-everywhere.dtd b/src/chrome/locale/nl/https-everywhere.dtd index bfbe43a55df9..0cc873f0f4ea 100644 --- a/src/chrome/locale/nl/https-everywhere.dtd +++ b/src/chrome/locale/nl/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/pl/https-everywhere.dtd b/src/chrome/locale/pl/https-everywhere.dtd index c676d71ef965..d87d99ea5ff6 100644 --- a/src/chrome/locale/pl/https-everywhere.dtd +++ b/src/chrome/locale/pl/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/pt/https-everywhere.dtd b/src/chrome/locale/pt/https-everywhere.dtd index d698764812c6..b1fa8e414542 100644 --- a/src/chrome/locale/pt/https-everywhere.dtd +++ b/src/chrome/locale/pt/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/pt_BR/https-everywhere.dtd b/src/chrome/locale/pt_BR/https-everywhere.dtd index bcc918fb6b55..0758745410e9 100644 --- a/src/chrome/locale/pt_BR/https-everywhere.dtd +++ b/src/chrome/locale/pt_BR/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/ro/https-everywhere.dtd b/src/chrome/locale/ro/https-everywhere.dtd index 357dd4e2ff82..03acb3777dd7 100644 --- a/src/chrome/locale/ro/https-everywhere.dtd +++ b/src/chrome/locale/ro/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/ru/https-everywhere.dtd b/src/chrome/locale/ru/https-everywhere.dtd index 9c004734bb13..3105911e6b6a 100644 --- a/src/chrome/locale/ru/https-everywhere.dtd +++ b/src/chrome/locale/ru/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/si_LK/https-everywhere.dtd b/src/chrome/locale/si_LK/https-everywhere.dtd index 802ec5c1eae0..8853453ad56a 100644 --- a/src/chrome/locale/si_LK/https-everywhere.dtd +++ b/src/chrome/locale/si_LK/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/sk/https-everywhere.dtd b/src/chrome/locale/sk/https-everywhere.dtd index 29ad6e918982..f1f3ce66418b 100644 --- a/src/chrome/locale/sk/https-everywhere.dtd +++ b/src/chrome/locale/sk/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/sk_SK/https-everywhere.dtd b/src/chrome/locale/sk_SK/https-everywhere.dtd index 2b16bb0f70ed..a5b5e2687ddc 100644 --- a/src/chrome/locale/sk_SK/https-everywhere.dtd +++ b/src/chrome/locale/sk_SK/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/sl/https-everywhere.dtd b/src/chrome/locale/sl/https-everywhere.dtd index 8faef674e98f..14a2525d1fdb 100644 --- a/src/chrome/locale/sl/https-everywhere.dtd +++ b/src/chrome/locale/sl/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/sl_SI/https-everywhere.dtd b/src/chrome/locale/sl_SI/https-everywhere.dtd index 705a73552c2a..c7fd21e9e6f7 100644 --- a/src/chrome/locale/sl_SI/https-everywhere.dtd +++ b/src/chrome/locale/sl_SI/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/sq/https-everywhere.dtd b/src/chrome/locale/sq/https-everywhere.dtd index 66cafc773ffb..7216fb08cfe0 100644 --- a/src/chrome/locale/sq/https-everywhere.dtd +++ b/src/chrome/locale/sq/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/sr/https-everywhere.dtd b/src/chrome/locale/sr/https-everywhere.dtd index 279f16f9f808..c33c8b072f17 100644 --- a/src/chrome/locale/sr/https-everywhere.dtd +++ b/src/chrome/locale/sr/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/sv/https-everywhere.dtd b/src/chrome/locale/sv/https-everywhere.dtd index ed9d0aad8f24..2550f3dc491c 100644 --- a/src/chrome/locale/sv/https-everywhere.dtd +++ b/src/chrome/locale/sv/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/th/https-everywhere.dtd b/src/chrome/locale/th/https-everywhere.dtd index 13dc10d4b7bf..bd7fb546ecb0 100644 --- a/src/chrome/locale/th/https-everywhere.dtd +++ b/src/chrome/locale/th/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/tr/https-everywhere.dtd b/src/chrome/locale/tr/https-everywhere.dtd index 80619a746687..8ecfc00fbbc4 100644 --- a/src/chrome/locale/tr/https-everywhere.dtd +++ b/src/chrome/locale/tr/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/uk/https-everywhere.dtd b/src/chrome/locale/uk/https-everywhere.dtd index 9b5a0dab0fa5..6c5c933b5aa1 100644 --- a/src/chrome/locale/uk/https-everywhere.dtd +++ b/src/chrome/locale/uk/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/zh-CN/https-everywhere.dtd b/src/chrome/locale/zh-CN/https-everywhere.dtd index 9fb2af47d7c9..9c6b501736a8 100644 --- a/src/chrome/locale/zh-CN/https-everywhere.dtd +++ b/src/chrome/locale/zh-CN/https-everywhere.dtd @@ -17,6 +17,7 @@ + diff --git a/src/chrome/locale/zh_TW/https-everywhere.dtd b/src/chrome/locale/zh_TW/https-everywhere.dtd index 86a1dad6afd4..f4803cec2e7e 100644 --- a/src/chrome/locale/zh_TW/https-everywhere.dtd +++ b/src/chrome/locale/zh_TW/https-everywhere.dtd @@ -17,6 +17,7 @@ + From d757202c97d747b8b5ccaf4bd1cf6e3f60e584e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Fuglede=20J=C3=B8rgensen?= Date: Mon, 29 Jun 2015 22:46:39 +0200 Subject: [PATCH 04/10] Moved UI initialisation to separate method --- src/chrome/content/toolbar_button.js | 61 +++++++++++++++++----------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/src/chrome/content/toolbar_button.js b/src/chrome/content/toolbar_button.js index 1b441f55f85c..bdf607edbb4b 100644 --- a/src/chrome/content/toolbar_button.js +++ b/src/chrome/content/toolbar_button.js @@ -64,29 +64,7 @@ httpsEverywhere.toolbarButton = { var tb = httpsEverywhere.toolbarButton; // make sure the checkbox for showing counters are properly set - var showCounter = tb.shouldShowCounter(); - var counterItem = document.getElementById('https-everywhere-counter-item'); - if (counterItem) { - counterItem.setAttribute('checked', showCounter); - } - var showCounterTotal = tb.shouldShowCounterTotal(); - var counterTotalItem = document.getElementById('https-everywhere-counter-total-item'); - if (counterTotalItem) { - counterTotalItem.setAttribute('checked', showCounterTotal); - counterTotalItem.setAttribute('disabled', !showCounter); - } - - // make sure UI for HTTP Nowhere mode is properly set - var httpNowhereItem = document.getElementById('http-nowhere-item'); - var showHttpNowhere = tb.shouldShowHttpNowhere(); - var toolbarbutton = document.getElementById('https-everywhere-button'); - if (httpNowhereItem) { - httpNowhereItem.setAttribute('checked', showHttpNowhere ? 'true' : 'false'); - } - if (toolbarbutton) { - toolbarbutton.setAttribute('http_nowhere', - showHttpNowhere ? 'true' : 'false'); - } + tb.updateMenuItems(); // make sure UI is set depending on whether HTTPS-E is enabled toggleEnabledUI(); @@ -170,7 +148,44 @@ httpsEverywhere.toolbarButton = { return window.BrowserApp.selectedBrowser; } }, + + /** + * Update the toolbar button image and menuitem checkboxes to current settings. + */ + updateMenuItems: function() { + HTTPSEverywhere.log(DBUG, 'Updating toolbar button image and menu item checkboxes.'); + var tb = httpsEverywhere.toolbarButton; + // make sure the checkbox for showing counters are properly set + var showCounter = tb.shouldShowCounter(); + var counterItem = document.getElementById('https-everywhere-counter-item'); + if (counterItem) { + HTTPSEverywhere.log(INFO, 'Setting ruleset counter checkbox to '+showCounter); + counterItem.setAttribute('checked', showCounter); + } + var showCounterTotal = tb.shouldShowCounterTotal(); + var counterTotalItem = document.getElementById('https-everywhere-counter-total-item'); + if (counterTotalItem) { + HTTPSEverywhere.log(INFO, 'Setting total ruleset counter checkbox to '+showCounterTotal); + counterTotalItem.setAttribute('checked', showCounterTotal); + // No reason to be able to change the setting for showing the total + // count of applicable rulesets if we do not even show the active ones. + counterTotalItem.setAttribute('disabled', !showCounter); + } + + // make sure UI for HTTP Nowhere mode is properly set + var httpNowhereItem = document.getElementById('http-nowhere-item'); + var showHttpNowhere = tb.shouldShowHttpNowhere(); + var toolbarbutton = document.getElementById('https-everywhere-button'); + if (httpNowhereItem) { + HTTPSEverywhere.log(INFO, 'Setting HTTP Nowhere checkbox to '+showHttpNowhere); + httpNowhereItem.setAttribute('checked', showHttpNowhere); + } + if (toolbarbutton) { + toolbarbutton.setAttribute('http_nowhere', showHttpNowhere); + } + }, + /** * Update the rulesets applied counter for the current tab. */ From 4d1da58f8163246a5a79220411b2972b1f5d6522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Fuglede=20J=C3=B8rgensen?= Date: Tue, 30 Jun 2015 21:09:24 +0200 Subject: [PATCH 05/10] Update UI even when toolbar button is hidden --- src/chrome/content/toolbar_button.js | 58 ++++++++++++++++++---------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/src/chrome/content/toolbar_button.js b/src/chrome/content/toolbar_button.js index bdf607edbb4b..d45f65346ea1 100644 --- a/src/chrome/content/toolbar_button.js +++ b/src/chrome/content/toolbar_button.js @@ -151,38 +151,56 @@ httpsEverywhere.toolbarButton = { /** * Update the toolbar button image and menuitem checkboxes to current settings. + * This is used when the UI is initialized. */ updateMenuItems: function() { - HTTPSEverywhere.log(DBUG, 'Updating toolbar button image and menu item checkboxes.'); + HTTPSEverywhere.log(INFO, 'Updating toolbar button image and menu item checkboxes.'); var tb = httpsEverywhere.toolbarButton; - // make sure the checkbox for showing counters are properly set - var showCounter = tb.shouldShowCounter(); var counterItem = document.getElementById('https-everywhere-counter-item'); - if (counterItem) { - HTTPSEverywhere.log(INFO, 'Setting ruleset counter checkbox to '+showCounter); - counterItem.setAttribute('checked', showCounter); + + var uiFound = false; + + if (counterItem) { // If we can find the counterItem like this, we can find everything in the UI. + uiFound = true; + var counterTotalItem = document.getElementById('https-everywhere-counter-total-item'); + var httpNowhereItem = document.getElementById('http-nowhere-item'); + var toolbarbutton = document.getElementById('https-everywhere-button'); + } else { + // If the toolbar button is hidden away in the Firefox hamburger menu, + // we won't find it by the above, and need to look somewhere else + let palette = document.getElementById("navigator-toolbox").palette; + counterItem = palette.querySelector("#https-everywhere-counter-item"); + if (counterItem) { + HTTPSEverywhere.log(DBUG, 'The toolbar button was trying to hide'); + uiFound = true; + counterItem.setAttribute('checked', showCounter); + var counterTotalItem = palette.querySelector('#https-everywhere-counter-total-item'); + var httpNowhereItem = palette.querySelector('#http-nowhere-item'); + var toolbarbutton = palette.querySelector('#https-everywhere-button'); + } } - var showCounterTotal = tb.shouldShowCounterTotal(); - var counterTotalItem = document.getElementById('https-everywhere-counter-total-item'); - if (counterTotalItem) { - HTTPSEverywhere.log(INFO, 'Setting total ruleset counter checkbox to '+showCounterTotal); + + if (uiFound) { + // make sure the checkbox for showing counters are properly set + var showCounter = tb.shouldShowCounter(); + HTTPSEverywhere.log(DBUG, 'Setting ruleset counter checkbox to '+showCounter); + counterItem.setAttribute('checked', showCounter); + + var showCounterTotal = tb.shouldShowCounterTotal(); + HTTPSEverywhere.log(DBUG, 'Setting total ruleset counter checkbox to '+showCounterTotal); counterTotalItem.setAttribute('checked', showCounterTotal); // No reason to be able to change the setting for showing the total // count of applicable rulesets if we do not even show the active ones. counterTotalItem.setAttribute('disabled', !showCounter); - } - - // make sure UI for HTTP Nowhere mode is properly set - var httpNowhereItem = document.getElementById('http-nowhere-item'); - var showHttpNowhere = tb.shouldShowHttpNowhere(); - var toolbarbutton = document.getElementById('https-everywhere-button'); - if (httpNowhereItem) { - HTTPSEverywhere.log(INFO, 'Setting HTTP Nowhere checkbox to '+showHttpNowhere); + + // make sure UI for HTTP Nowhere mode is properly set + var showHttpNowhere = tb.shouldShowHttpNowhere(); + HTTPSEverywhere.log(DBUG, 'Setting HTTP Nowhere checkbox to '+showHttpNowhere); httpNowhereItem.setAttribute('checked', showHttpNowhere); - } - if (toolbarbutton) { toolbarbutton.setAttribute('http_nowhere', showHttpNowhere); + } else { + HTTPSEverywhere.log(WARN, 'UI not found.'); } }, From 2018819aa3e364b49af1d237493849960951bfa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Fuglede=20J=C3=B8rgensen?= Date: Tue, 30 Jun 2015 21:43:45 +0200 Subject: [PATCH 06/10] Draw counter label also when toolbarbutton is hidden --- src/chrome/content/toolbar_button.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/toolbar_button.js b/src/chrome/content/toolbar_button.js index d45f65346ea1..fe573b8cdfcb 100644 --- a/src/chrome/content/toolbar_button.js +++ b/src/chrome/content/toolbar_button.js @@ -210,7 +210,13 @@ httpsEverywhere.toolbarButton = { updateRulesetsApplied: function() { var toolbarbutton = document.getElementById('https-everywhere-button'); if (!toolbarbutton) { - return; + // This becomes relevant for instance when the toolbar button is + // hidden away in the Firefox hamburger menu. + let palette = document.getElementById("navigator-toolbox").palette; + var toolbarbutton = palette.querySelector('#https-everywhere-button'); + if (!toolbarbutton) { + return; + } } var enabled = HTTPSEverywhere.prefs.getBoolPref("globalEnabled"); From 70d287b55bc3f88da6149b726e3d352eca5472a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Fuglede=20J=C3=B8rgensen?= Date: Wed, 1 Jul 2015 16:14:58 +0200 Subject: [PATCH 07/10] Update toggleEnabledUI to handle the case of a hidden button --- src/chrome/content/toolbar_button.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/chrome/content/toolbar_button.js b/src/chrome/content/toolbar_button.js index fe573b8cdfcb..aaa008f8d6ac 100644 --- a/src/chrome/content/toolbar_button.js +++ b/src/chrome/content/toolbar_button.js @@ -437,6 +437,11 @@ function toggleEnabledUI() { // Change icon depending on enabled state var toolbarbutton = document.getElementById('https-everywhere-button'); + if (!toolbarbutton) { + // If we did not find the button, look for it in the hamburger menu. + let palette = document.getElementById("navigator-toolbox").palette; + var toolbarbutton = palette.querySelector('#https-everywhere-button'); + } if (toolbarbutton) { toolbarbutton.setAttribute('status', enabled ? 'enabled' : 'disabled'); } From e24d95287f3e350860626847ecfff0b59f83d024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Fuglede=20J=C3=B8rgensen?= Date: Fri, 3 Jul 2015 14:57:47 +0200 Subject: [PATCH 08/10] Check for the existence of toolbox before using it --- src/chrome/content/toolbar_button.js | 39 +++++++++++++++++----------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/src/chrome/content/toolbar_button.js b/src/chrome/content/toolbar_button.js index aaa008f8d6ac..aea2c7ee25b7 100644 --- a/src/chrome/content/toolbar_button.js +++ b/src/chrome/content/toolbar_button.js @@ -169,15 +169,18 @@ httpsEverywhere.toolbarButton = { } else { // If the toolbar button is hidden away in the Firefox hamburger menu, // we won't find it by the above, and need to look somewhere else - let palette = document.getElementById("navigator-toolbox").palette; - counterItem = palette.querySelector("#https-everywhere-counter-item"); - if (counterItem) { - HTTPSEverywhere.log(DBUG, 'The toolbar button was trying to hide'); - uiFound = true; - counterItem.setAttribute('checked', showCounter); - var counterTotalItem = palette.querySelector('#https-everywhere-counter-total-item'); - var httpNowhereItem = palette.querySelector('#http-nowhere-item'); - var toolbarbutton = palette.querySelector('#https-everywhere-button'); + var toolbox = document.getElementById("navigator-toolbox"); + if (toolbox) { + let palette = toolbox.palette; + counterItem = palette.querySelector("#https-everywhere-counter-item"); + if (counterItem) { + HTTPSEverywhere.log(DBUG, 'The toolbar button was trying to hide'); + uiFound = true; + counterItem.setAttribute('checked', showCounter); + var counterTotalItem = palette.querySelector('#https-everywhere-counter-total-item'); + var httpNowhereItem = palette.querySelector('#http-nowhere-item'); + var toolbarbutton = palette.querySelector('#https-everywhere-button'); + } } } @@ -212,10 +215,13 @@ httpsEverywhere.toolbarButton = { if (!toolbarbutton) { // This becomes relevant for instance when the toolbar button is // hidden away in the Firefox hamburger menu. - let palette = document.getElementById("navigator-toolbox").palette; - var toolbarbutton = palette.querySelector('#https-everywhere-button'); - if (!toolbarbutton) { - return; + var toolbox = document.getElementById("navigator-toolbox"); + if (toolbox) { + palette = toolbox.palette; + var toolbarbutton = palette.querySelector('#https-everywhere-button'); + if (!toolbarbutton) { + return; + } } } @@ -439,8 +445,11 @@ function toggleEnabledUI() { var toolbarbutton = document.getElementById('https-everywhere-button'); if (!toolbarbutton) { // If we did not find the button, look for it in the hamburger menu. - let palette = document.getElementById("navigator-toolbox").palette; - var toolbarbutton = palette.querySelector('#https-everywhere-button'); + var toolbox = document.getElementById("navigator-toolbox"); + if (toolbox) { + var palette = toolbox.palette; + var toolbarbutton = palette.querySelector('#https-everywhere-button'); + } } if (toolbarbutton) { toolbarbutton.setAttribute('status', enabled ? 'enabled' : 'disabled'); From 5c4ab2396d37178e8a50435388fd132a301e169a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Fuglede=20J=C3=B8rgensen?= Date: Fri, 3 Jul 2015 15:19:33 +0200 Subject: [PATCH 09/10] Never show the counter label "0/0" --- src/chrome/content/toolbar_button.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/toolbar_button.js b/src/chrome/content/toolbar_button.js index aea2c7ee25b7..7f79c2b8cd6e 100644 --- a/src/chrome/content/toolbar_button.js +++ b/src/chrome/content/toolbar_button.js @@ -246,9 +246,14 @@ httpsEverywhere.toolbarButton = { var rulesetsApplied = alist.count_applied(); var rulesetsTotal = alist.count_all(); + if (!rulesetsTotal) { + toolbarbutton.setAttribute('rulesetsApplied', 0); + return; + } + var includeTotals = httpsEverywhere.toolbarButton.shouldShowCounterTotal(); var counterLabel = includeTotals ? rulesetsApplied + '/' + rulesetsTotal : rulesetsApplied; - + toolbarbutton.setAttribute('rulesetsApplied', counterLabel); HTTPSEverywhere.log(INFO, 'Setting icon counter to: ' + counterLabel); }, From 548d3b1d6449b373b4ce2beccf0e8c776b49143f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Fuglede=20J=C3=B8rgensen?= Date: Sun, 23 Aug 2015 00:55:27 +0200 Subject: [PATCH 10/10] Add tooltip to counter label --- src/chrome/content/toolbar_button_binding.xml | 6 +++++- src/chrome/locale/en/https-everywhere.dtd | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/toolbar_button_binding.xml b/src/chrome/content/toolbar_button_binding.xml index 1981b3a2b913..677ecc8082be 100644 --- a/src/chrome/content/toolbar_button_binding.xml +++ b/src/chrome/content/toolbar_button_binding.xml @@ -1,4 +1,7 @@ + + + - +