Adblock rebranded to Spyblock

1 files changed, 23 insertions, 3 deletions

diff --git a/helpers/DATA/firefox/trisquel/extensions/abouticecat@gnu.org/chrome/content/aboutIceCat/aboutIceCat.xhtml b/helpers/DATA/firefox/trisquel/extensions/abouticecat@gnu.org/chrome/content/aboutIceCat/aboutIceCat.xhtml
index 3999c6a..ad7655b 100644
--- a/helpers/DATA/firefox/trisquel/extensions/abouticecat@gnu.org/chrome/content/aboutIceCat/aboutIceCat.xhtml
+++ b/helpers/DATA/firefox/trisquel/extensions/abouticecat@gnu.org/chrome/content/aboutIceCat/aboutIceCat.xhtml
@@ -127,6 +127,12 @@ function fontsettings(sel){
     Services.prefs.clearUserPref(sel.id);
 }
 
+function jssettings(sel){
+  if (sel.checked){
+    Services.prefs.setBoolPref(sel.id, !sel.checked);}
+  else
+    Services.prefs.clearUserPref(sel.id);
+}
 
 function prepare(){
 
@@ -148,7 +154,7 @@ Services.prefs.setIntPref("extensions.icecathome.browser.display.use_document_fo
 
   var extensions=[
 ["jid1-KtlZuoiikVfFew@jetpack","Block execution of non-free <a target=\"_blank\" href=\"http://www.gnu.org/software/librejs/\">JavaScript</a> <em>(experimental)</em>"],
-["{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}","Block privacy <a target=\"_blank\" href=\"https://easylist.adblockplus.org\">trackers</a>"],
+["spyblock@gnu.org","Block privacy <a target=\"_blank\" href=\"https://easylist.adblockplus.org\">trackers</a>"],
 ["torproxy@trisquel","Use <a target=\"_blank\" href=\"https://www.torproject.org/\">Tor</a> when in Private Mode"],
 ["https-everywhere@eff.org","Get redirected to <a target=\"_blank\" href=\"https://www.eff.org/https-everywhere/faq\">HTTPS</a> when possible"],
 ]
@@ -168,7 +174,6 @@ Services.prefs.setIntPref("extensions.icecathome.browser.display.use_document_fo
 
     f.appendChild(tmp);
     f.appendChild(label);
-    f.appendChild(document.createElement("br"));
 
     document.getElementById("addonsform").appendChild(f);
   }
@@ -205,6 +210,21 @@ Services.prefs.setIntPref("extensions.icecathome.browser.display.use_document_fo
   f.appendChild(document.createElement("br"));
   document.getElementById("addonsform").appendChild(f);
 
+  var tmp = document.createElement("input");
+  tmp.setAttribute('type',"checkbox");
+  tmp.setAttribute('id', "javascript.enabled");
+  tmp.setAttribute('value', 0);
+  tmp.setAttribute('onclick','jssettings(this);');
+  value=Services.prefs.getBoolPref("javascript.enabled");
+  tmp.checked=(value==0);
+  var label = document.createElement("label");
+  label.htmlFor =  "javascript.enabled" ;
+  label.id = "javascript.enabledlabel";
+  label.appendChild(document.createTextNode("Disable JavaScript"));
+  f.appendChild(tmp);
+  f.appendChild(label);
+  f.appendChild(document.createElement("br"));
+  document.getElementById("addonsform").appendChild(f);
 
   for (var i=0; i<extensions.length; ++i) {
     var ex=extensions[i][0];
@@ -220,7 +240,7 @@ Services.prefs.setIntPref("extensions.icecathome.browser.display.use_document_fo
     if ( addonObj != null){
       document.getElementById(ex).checked = addonObj.isActive;
       //document.getElementById(ex+'label').innerHTML = addonObj.name;
-      document.getElementById(ex+'label').innerHTML = extensions[i][1];
+      document.getElementById(ex+'label').innerHTML = extensions[i][1]+"<br/>";
     }else{
       document.getElementById(ex).style.display='none';
       document.getElementById(ex+'label').style.display='none';