Issue 2816 - Partial fix for EHH button in inspector tool, preview functionality still broken

chrome/content/composer.js

 /*
  * This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/.
  */
 
 let {Prefs} = require("prefs");
 
 let domainData;
 let nodeData;
@@ skipping 67 matching lines @@
   this.getRowProperties(row);
 }
 
 /*********************
  * General functions *
  *********************/
 
 function init()
 {
   nodeData = window.arguments[0];
-  let domain = window.arguments[1];
+  let host = window.arguments[1];
 
   // Check whether element hiding group is disabled
   let subscription = AdblockPlus.getSubscription("~eh~");
   if (subscription && subscription.disabled)
   {
     let warning = document.getElementById("groupDisabledWarning");
     if (/\?1\?/.test(warning.textContent))
       warning.textContent = warning.textContent.replace(/\?1\?/g, subscription.title);
     warning.hidden = false;
   }
@@ skipping 28 matching lines @@
   switch (Prefs.composer_defaultDomain)
   {
     case 0:
       selectedDomain = "";
       break;
     case 1:
       try
       {
         // EffectiveTLDService will throw for IP addresses, just go to the next case then
         let effectiveTLD = Cc["@mozilla.org/network/effective-tld-service;1"].getService(Ci.nsIEffectiveTLDService);
-        selectedDomain = effectiveTLD.getPublicSuffixFromHost(domain);
+        selectedDomain = effectiveTLD.getPublicSuffixFromHost(host);
         break;
       } catch (e) {}
     case 2:
       try
       {
         // EffectiveTLDService will throw for IP addresses, just go to the next case then
         let effectiveTLD = Cc["@mozilla.org/network/effective-tld-service;1"].getService(Ci.nsIEffectiveTLDService);
-        selectedDomain = effectiveTLD.getBaseDomainFromHost(domain);
+        selectedDomain = effectiveTLD.getBaseDomainFromHost(host);
         break;
       } catch (e) {}
     case 3:
-      selectedDomain = domain.replace(/^www\./, "");
+      selectedDomain = host.replace(/^www\./, "");
       break;
     default:
-      selectedDomain = domain;
+      selectedDomain = host;
       break;
   }
-  domainData = {value: domain, selected: selectedDomain};
+  domainData = {value: host, selected: selectedDomain};
 
   fillDomains(domainData);
   fillNodes(nodeData);
   setAdvancedMode(document.documentElement.getAttribute("advancedMode") == "true");
   updateExpression();
 
   setTimeout(function() {
     document.getElementById("domainGroup").selectedItem.focus();
     if (document.getElementById("preview").checked)
       togglePreview(true);
@@ skipping 415 matching lines @@
 
   fillAttributes(item.nodeData);
 }
 
 function addExpression()
 {
   AdblockPlus.addPatterns([document.getElementById("expression").value]);
 
   togglePreview(false);
 }