Issue 1670 - Removed "Hide placeholders" option from the UI (Firefox)

lib/ui.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 487 matching lines @@
 
     this.firstRunDone = true;
 
     let {addonVersion} = require("info");
     let prevVersion = Prefs.currentVersion;
     if (prevVersion != addonVersion)
     {
       Prefs.currentVersion = addonVersion;
       this.addSubscription(window, prevVersion);
 
-      // The "Hide placeholders" option has been removed from the UI in 2.6.6.3879
+      // 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.3879") < 0)
+      if (prevVersion && Services.vc.compare(prevVersion, "2.6.6.3881") < 0)
         Prefs.fastcollapse = false;
     }
   },
 
   /**
    * Will be set to true after the check whether first-run actions should run
    * has been performed.
    * @type Boolean
    */
   firstRunDone: false,
@@ skipping 428 matching lines @@
     if (!title)
       title = url;
 
     // Main subscription needs both title and URL
     if (mainSubscriptionTitle && !mainSubscriptionURL)
       mainSubscriptionTitle = null;
     if (mainSubscriptionURL && !mainSubscriptionTitle)
       mainSubscriptionURL = null;
 
     // Trim spaces in title and URL
-    title = title.replace(/^\s+/, "").replace(/\s+$/, "");
-    url = url.replace(/^\s+/, "").replace(/\s+$/, "");
+    title = title.trim();
+    url = url.trim();
     if (mainSubscriptionURL)
     {
-      mainSubscriptionTitle = mainSubscriptionTitle.replace(/^\s+/, "").replace(/\s+$/, "");
-      mainSubscriptionURL = mainSubscriptionURL.replace(/^\s+/, "").replace(/\s+$/, "");
+      mainSubscriptionTitle = mainSubscriptionTitle.trim();
+      mainSubscriptionURL = mainSubscriptionURL.trim();
     }
 
     // Verify that the URL is valid
     url = Utils.makeURI(url);
     if (!url || (url.scheme != "http" && url.scheme != "https" && url.scheme != "ftp"))
       return;
     url = url.spec;
 
     if (mainSubscriptionURL)
     {
@@ skipping 555 matching lines @@
         setChecked(prefix + "whitelistsite", siteWhitelist.subscriptions.length && !siteWhitelist.disabled);
         generateLabel(prefix + "whitelistsite", location.spec.replace(/^mailto:/, ""));
         hideElement(prefix + "whitelistsite", false);
       }
     }
 
     setDisabled("abp-command-sendReport", !location || !Policy.isBlockableScheme(location) || location.scheme == "mailto");
 
     setChecked(prefix + "disabled", !Prefs.enabled);
     setChecked(prefix + "frameobjects", Prefs.frameobjects);
-    setChecked(prefix + "slowcollapse", !Prefs.fastcollapse);

[Wladimir Palant, 2014/12/11 10:23:15]

Wait, shouldn't this be removed as well?

[Sebastian Noack, 2014/12/11 10:41:28]

Done.

     setChecked(prefix + "savestats", Prefs.savestats);
 
     let {defaultToolbarPosition, statusbarPosition} = require("appSupport");
     let hasToolbar = defaultToolbarPosition;
     let hasStatusBar = statusbarPosition;
     hideElement(prefix + "showintoolbar", !hasToolbar || prefix == "abp-toolbar-");
     hideElement(prefix + "showinstatusbar", !hasStatusBar);
     hideElement(prefix + "iconSettingsSeparator", (prefix == "abp-toolbar-" || !hasToolbar) && !hasStatusBar);
 
     setChecked(prefix + "showintoolbar", this.isToolbarIconVisible());
@@ skipping 388 matching lines @@
  * handler the element ID, event and the actual event handler are listed.
  * @type Array
  */
 let eventHandlers = [
   ["abp-command-sendReport", "command", UI.openReportDialog.bind(UI)],
   ["abp-command-filters", "command", UI.openFiltersDialog.bind(UI)],
   ["abp-command-sidebar", "command", UI.toggleBottombar.bind(UI)],
   ["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")],

[Wladimir Palant, 2014/12/11 10:23:15]

And this.

[Sebastian Noack, 2014/12/11 10:41:28]

Done.

   ["abp-command-togglesavestats", "command", UI.toggleSaveStats.bind(UI)],
   ["abp-command-togglesync", "command", UI.toggleSync.bind(UI)],
   ["abp-command-toggleshowintoolbar", "command", UI.toggleToolbarIcon.bind(UI)],
   ["abp-command-toggleshowinstatusbar", "command", UI.togglePref.bind(UI, "showinstatusbar")],
   ["abp-command-enable", "command", UI.togglePref.bind(UI, "enabled")],
   ["abp-command-contribute", "command", UI.openContributePage.bind(UI)],
   ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)]
 ];
 
 onShutdown.add(function()
 {
   for (let window in UI.applicationWindows)
     if (UI.isBottombarOpen(window))
       UI.toggleBottombar(window);
 });