[Pkg-mozext-commits] [requestpolicy] 64/100: Add preference for blacklist placeholders

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit f17c73946f792c8bb083f647393e29201a6bf383
Author: Gaetan Gilbert <gaetan.gilbert at ens-lyon.fr>
Date:   Wed Nov 5 14:07:23 2014 +0100

    Add preference for blacklist placeholders
---
 src/content/overlay.js                    |  2 +-
 src/content/settings/basicprefs.html      |  8 +++++++-
 src/content/settings/basicprefs.js        | 11 +++++++++++
 src/defaults/preferences/defaults.js      |  1 +
 src/locale/en-US/requestpolicy.properties |  1 +
 src/locale/fr/requestpolicy.properties    |  1 +
 6 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/content/overlay.js b/src/content/overlay.js
index 414bd5a..89ded8e 100644
--- a/src/content/overlay.js
+++ b/src/content/overlay.js
@@ -673,7 +673,7 @@ requestpolicy.overlay = {
     for (var destBase in rejectedRequests) {
       for (var destIdent in rejectedRequests[destBase]) {
         for (var destUri in rejectedRequests[destBase][destIdent]) {
-          var shouldPlacehold = false; // = pref(show placeholder for blacklisted images)
+          var shouldPlacehold = this._rpService.prefs.getBoolPref("indicateBlacklistedObjects");
           var results = rejectedRequests[destBase][destIdent][destUri];
           for(var i=0; i < results.length && !shouldPlacehold; i++)
             shouldPlacehold = results[i].isDefaultPolicyUsed(); // if a request is blocked not by the default policy it's by a blacklist
diff --git a/src/content/settings/basicprefs.html b/src/content/settings/basicprefs.html
index 81f423a..8447629 100644
--- a/src/content/settings/basicprefs.html
+++ b/src/content/settings/basicprefs.html
@@ -47,6 +47,12 @@
               </div>
               <div>
                 <label>
+                  <input type="checkbox" id="pref-indicateBlacklistedObjects"/>
+                  <span data-string="indicateBlacklistedImages"></span>
+                </label>
+              </div>
+              <div>
+                <label>
                   <input type="checkbox" id="pref-autoReload"/>
                   <span data-string="autoReload"></span>
                 </label>
@@ -73,4 +79,4 @@
 </table>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/content/settings/basicprefs.js b/src/content/settings/basicprefs.js
index e0a43ec..930bf8b 100644
--- a/src/content/settings/basicprefs.js
+++ b/src/content/settings/basicprefs.js
@@ -3,6 +3,7 @@ PAGE_STRINGS = [
   'advanced',
   'webPages',
   'indicateBlockedImages',
+  'indicateBlacklistedImages',
   'autoReload',
   'menu',
   'allowAddingNonTemporaryRulesInPBM'
@@ -19,6 +20,9 @@ function updateDisplay() {
   document.getElementById('pref-indicateBlockedObjects').checked =
       rpService.prefs.getBoolPref('indicateBlockedObjects');
 
+  document.getElementById('pref-indicateBlacklistedObjects').checked =
+      rpService.prefs.getBoolPref('indicateBlacklistedObjects');
+
   document.getElementById('pref-autoReload').checked =
       rpService.prefs.getBoolPref('autoReload');
 
@@ -44,6 +48,13 @@ function onload() {
       }
   );
 
+  document.getElementById('pref-indicateBlacklistedObjects').addEventListener('change',
+      function (event) {
+        rpService.prefs.setBoolPref('indicateBlacklistedObjects', event.target.checked);
+        rpService._prefService.savePrefFile(null);
+      }
+  );
+
   document.getElementById('pref-autoReload').addEventListener('change',
     function(event) {
       rpService.prefs.setBoolPref('autoReload', event.target.checked);
diff --git a/src/defaults/preferences/defaults.js b/src/defaults/preferences/defaults.js
index 6f34203..9db0bcf 100644
--- a/src/defaults/preferences/defaults.js
+++ b/src/defaults/preferences/defaults.js
@@ -13,6 +13,7 @@ pref("extensions.requestpolicy.defaultPolicy.allowSameDomain", true);
 pref("extensions.requestpolicy.welcomeWindowShown", false);
 
 pref("extensions.requestpolicy.indicateBlockedObjects", true);
+pref("extensions.requestpolicy.indicateBlacklistedObjects", true);
 pref("extensions.requestpolicy.startWithAllowAllEnabled", false);
 pref("extensions.requestpolicy.privateBrowsingPermanentWhitelisting", false);
 
diff --git a/src/locale/en-US/requestpolicy.properties b/src/locale/en-US/requestpolicy.properties
index a225e2a..f7ef5d9 100644
--- a/src/locale/en-US/requestpolicy.properties
+++ b/src/locale/en-US/requestpolicy.properties
@@ -39,6 +39,7 @@ help=Help
 basic=Basic
 advanced=Advanced
 indicateBlockedImages=Indicate blocked images
+indicateBlacklistedImages=Indicate blocked by blacklist images
 autoReload=Reload current page when whitelist is changed
 webPages=Web Pages
 menu=Menu
diff --git a/src/locale/fr/requestpolicy.properties b/src/locale/fr/requestpolicy.properties
index 941e7db..bb78935 100644
--- a/src/locale/fr/requestpolicy.properties
+++ b/src/locale/fr/requestpolicy.properties
@@ -39,6 +39,7 @@ help=Help
 basic=Basic
 advanced=Avancé
 indicateBlockedImages=Indiquer les images bloquées
+indicateBlacklistedImages=Indiquer les images bloquées par blacklist
 autoReload=Actualiser la page en cours lorsque liste blanche est modifiée
 webPages=Pages Web
 menu=Menu

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git