[Pkg-mozext-commits] [adblock-plus] 08/52: Issue 1670 - Removed "Hide placeholders" option from the UI

[David Prévot]

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

taffit pushed a commit to branch master
in repository adblock-plus.

commit db38cd181823db47931231f39f6026ddb6dc1c42
Author: Sebastian Noack <sebastian at adblockplug.org>
Date:   Mon Dec 8 19:10:01 2014 +0100

    Issue 1670 - Removed "Hide placeholders" option from the UI
    
    --HG--
    extra : rebase_source : 12aca2ee2bc2b8ad32b2fb9e42a2305c2a29379c
    extra : amend_source : 6c10e55871df88f4ebf9a9049522061d14fc8049
---
 chrome/content/ui/fennecSettings.xul | 2 --
 chrome/content/ui/overlay.xul        | 2 --
 chrome/content/ui/settings.xul       | 1 -
 chrome/locale/en-US/overlay.dtd      | 1 -
 lib/ui.js                            | 7 +++++--
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/chrome/content/ui/fennecSettings.xul b/chrome/content/ui/fennecSettings.xul
index 9063ba3..dda271c 100644
--- a/chrome/content/ui/fennecSettings.xul
+++ b/chrome/content/ui/fennecSettings.xul
@@ -31,8 +31,6 @@
   </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;"
     oncommand="/**See bug 762015*/ if (event.type == 'oncommand') {event = document.createEvent('Events'); event.initEvent('command', false, false); this.dispatchEvent(event);}"/>
 </vbox>
diff --git a/chrome/content/ui/overlay.xul b/chrome/content/ui/overlay.xul
index 9724859..747e840 100644
--- a/chrome/content/ui/overlay.xul
+++ b/chrome/content/ui/overlay.xul
@@ -59,7 +59,6 @@
     <menu id="abp-status-options" label="&options.label;">
       <menupopup id="abp-status-options-popup">
         <menuitem id="abp-status-frameobjects" label="&objecttabs.label;" type="checkbox" command="abp-command-toggleobjtabs"/>
-        <menuitem id="abp-status-slowcollapse" label="&hideplaceholders.label;" type="checkbox" command="abp-command-togglecollapse"/>
         <menuitem id="abp-status-savestats" label="&counthits.label;" type="checkbox" command="abp-command-togglesavestats"/>
         <menuitem id="abp-status-sync" label="&sync.label;" type="checkbox" command="abp-command-togglesync"/>
         <menuseparator id="abp-status-iconSettingsSeparator"/>
@@ -87,7 +86,6 @@
     <command id="abp-command-togglesitewhitelist"/>
     <command id="abp-command-togglepagewhitelist"/>
     <command id="abp-command-toggleobjtabs"/>
-    <command id="abp-command-togglecollapse"/>
     <command id="abp-command-togglesavestats"/>
     <command id="abp-command-togglesync"/>
     <command id="abp-command-toggleshowintoolbar"/>
diff --git a/chrome/content/ui/settings.xul b/chrome/content/ui/settings.xul
index 8e79441..9cc15c7 100644
--- a/chrome/content/ui/settings.xul
+++ b/chrome/content/ui/settings.xul
@@ -29,7 +29,6 @@
   </setting>
   <setting pref="extensions.adblockplus.enabled" type="bool" inverted="true" title="&disable.label;"/>
   <setting pref="extensions.adblockplus.frameobjects" type="bool" title="&objecttabs.label;"/>
-  <setting pref="extensions.adblockplus.fastcollapse" type="bool" inverted="true" title="&hideplaceholders.label;"/>
   <setting id="adblockplus-savestats" type="bool" title="&counthits.label;"/>
   <setting id="adblockplus-sync" type="bool" title="&sync.label;"/>
   <setting id="adblockplus-showintoolbar" type="bool" title="&showintoolbar.label;"/>
diff --git a/chrome/locale/en-US/overlay.dtd b/chrome/locale/en-US/overlay.dtd
index e9bd8f0..d005af2 100644
--- a/chrome/locale/en-US/overlay.dtd
+++ b/chrome/locale/en-US/overlay.dtd
@@ -29,7 +29,6 @@
 <!ENTITY showintoolbar.label        "Show in tool&bar">
 <!ENTITY showinstatusbar.label      "&Show in status bar">
 <!ENTITY objecttabs.label           "Show &tabs on Flash and Java">
-<!ENTITY hideplaceholders.label     "Hide p&laceholders of blocked elements">
 <!ENTITY counthits.label            "Count filter &hits">
 <!ENTITY sync.label                 "Syn&c Adblock Plus settings">
 <!ENTITY objecttab.title        "Block">
diff --git a/lib/ui.js b/lib/ui.js
index 3a82618..5d52a81 100644
--- a/lib/ui.js
+++ b/lib/ui.js
@@ -504,6 +504,11 @@ let UI = exports.UI =
     {
       Prefs.currentVersion = addonVersion;
       this.addSubscription(window, prevVersion);
+
+      // The "Hide placeholders" option has been removed from the UI in 2.6.6.3881
+      // So we reset the option for users updating from older versions.
+      if (prevVersion && Services.vc.compare(prevVersion, "2.6.6.3881") < 0)
+        Prefs.fastcollapse = false;
     }
   },
 
@@ -1532,7 +1537,6 @@ let UI = exports.UI =
 
     setChecked(prefix + "disabled", !Prefs.enabled);
     setChecked(prefix + "frameobjects", Prefs.frameobjects);
-    setChecked(prefix + "slowcollapse", !Prefs.fastcollapse);
     setChecked(prefix + "savestats", Prefs.savestats);
 
     let {defaultToolbarPosition, statusbarPosition} = require("appSupport");
@@ -1941,7 +1945,6 @@ let eventHandlers = [
   ["abp-command-togglesitewhitelist", "command", function() { UI.toggleFilter(siteWhitelist); }],
   ["abp-command-togglepagewhitelist", "command", function() { UI.toggleFilter(pageWhitelist); }],
   ["abp-command-toggleobjtabs", "command", UI.togglePref.bind(UI, "frameobjects")],
-  ["abp-command-togglecollapse", "command", UI.togglePref.bind(UI, "fastcollapse")],
   ["abp-command-togglesavestats", "command", UI.toggleSaveStats.bind(UI)],
   ["abp-command-togglesync", "command", UI.toggleSync.bind(UI)],
   ["abp-command-toggleshowintoolbar", "command", UI.toggleToolbarIcon.bind(UI)],

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