gnuzilla

commit 49f69726e55a719163f1c4483932cb82c2bea901
parent 9a0fd32cf6e2ada37675bc743532c5004b16e5e3
Author: Ruben Rodriguez <ruben@gnu.org>
Date:   Sun,  8 Mar 2015 15:15:00 +0000

Adapt Spyblock for mobile

Diffstat:
M
data/extensions/spyblock@gnu.org/chrome/content/ui/fennecSettings.xul
 | 
2
--
M
data/extensions/spyblock@gnu.org/lib/objectTabs.js
 | 
2
+-
M
data/extensions/spyblock@gnu.org/lib/utils.js
 | 
2
+-

3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/fennecSettings.xul b/data/extensions/spyblock@gnu.org/chrome/content/ui/fennecSettings.xul
@@ -29,8 +29,6 @@
   <setting type="control" title="&subscriptions.tab.label;">
     <menulist id="adblockplus-subscription-list"/>
   </setting>
-  <setting id="adblockplus-acceptableAds" type="bool" title="&acceptableAds2.label;"
-    oncommand="/**See bug 762015*/ if (event.type == 'oncommand') {event = document.createEvent('Events'); event.initEvent('command', false, false); this.dispatchEvent(event);}"/>
   <setting pref="extensions.adblockplus.fastcollapse" type="bool" title="&hideplaceholders.label;"
            inverted="true"/>
   <setting id="adblockplus-sync" type="bool" title="&sync.label;"
diff --git a/data/extensions/spyblock@gnu.org/lib/objectTabs.js b/data/extensions/spyblock@gnu.org/lib/objectTabs.js
@@ -178,7 +178,7 @@ var objTabs =
   {
     // Object tabs aren't usable in Fennec
     let {application} = require("info");
-    if (application == "fennec" || application == "fennec2")
+    if (application == "fennec" || application == "fennec2" || application == "icecatmobile")
       return;
 
     let {Prefs} = require("prefs");
diff --git a/data/extensions/spyblock@gnu.org/lib/utils.js b/data/extensions/spyblock@gnu.org/lib/utils.js
@@ -54,7 +54,7 @@ let Utils = exports.Utils =
   get isFennec()
   {
     let {application} = require("info");
-    let result = (application == "fennec" || application == "fennec2");
+    let result = (application == "fennec" || application == "fennec2" || application == "icecatmobile");
     Utils.__defineGetter__("isFennec", () => result);
     return result;
   },