[Pkg-mozext-commits] [adblock-plus-element-hiding-helper] 259/483: Topic 6180 - Composer: Make pre-selected domain configurable

[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-element-hiding-helper.

commit a410f5e32464da6bdfc1ada9e6315c55331a5bff
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Tue Oct 26 11:29:31 2010 +0200

    Topic 6180 - Composer: Make pre-selected domain configurable
---
 chrome/content/composer.js             | 31 +++++++++++++++++++++++++++++--
 defaults/preferences/elemhidehelper.js |  1 +
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/chrome/content/composer.js b/chrome/content/composer.js
index dc25652..402cec8 100644
--- a/chrome/content/composer.js
+++ b/chrome/content/composer.js
@@ -36,6 +36,9 @@ var stylesheetURL;
 var previewStyle = null;
 var doc;
 
+let baseURI = Cc["@adblockplus.org/ehh/startup;1"].getService(Ci.nsIURI);
+Cu.import(baseURI.spec + "Prefs.jsm");
+
 let abpURL = Cc["@adblockplus.org/abp/public;1"].getService(Ci.nsIURI);
 Cu.import(abpURL.spec);
 
@@ -191,8 +194,32 @@ function init() {
     }
   }
 
-  var domain = wnd.location.hostname;
-  var selectedDomain = domain.replace(/^www\./, "");
+  let domain = wnd.location.hostname;
+  let selectedDomain;
+  switch (Prefs.composer_defaultDomain)
+  {
+    case 0:
+      selectedDomain = "";
+      break;
+    case 1:
+    {
+      let effectiveTLD = Cc["@mozilla.org/network/effective-tld-service;1"].getService(Ci.nsIEffectiveTLDService);
+      selectedDomain = effectiveTLD.getPublicSuffixFromHost(domain);
+      break;
+    }
+    case 2:
+    {
+      let effectiveTLD = Cc["@mozilla.org/network/effective-tld-service;1"].getService(Ci.nsIEffectiveTLDService);
+      selectedDomain = effectiveTLD.getBaseDomainFromHost(domain);
+      break;
+    }
+    case 3:
+      selectedDomain = domain.replace(/^www\./, "");
+      break;
+    default:
+      selectedDomain = domain;
+      break;
+  }
   domainData = {value: domain, selected: selectedDomain};
 
   fillDomains(domainData);
diff --git a/defaults/preferences/elemhidehelper.js b/defaults/preferences/elemhidehelper.js
index 09b9ad7..155bc6f 100644
--- a/defaults/preferences/elemhidehelper.js
+++ b/defaults/preferences/elemhidehelper.js
@@ -1,3 +1,4 @@
 pref("extensions.elemhidehelper.selectelement_key", "Accel Shift K, Accel Shift S");
 pref("extensions.elemhidehelper.showhelp", true);
 pref("extensions.elemhidehelper.acceptlocalfiles", false);
+pref("extensions.elemhidehelper.composer_defaultDomain", 3);

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