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;
 let selectedNode = null;
 let advancedMode = false;
 let treeView = null;
 let stylesheetData;
 let previewStyle = null;
 let doc;
 
 let abpURL = Cc["@adblockplus.org/abp/public;1"].getService(Ci.nsIURI);
 Cu.import(abpURL.spec);
 
 /*******************
- * NodeData object *
- *******************/
-
-function NodeData(node, parentNode)
-{
-  function findElement(node, property)

[Thomas Greiner, 2015/07/28 13:52:18]

Detail: Note that if you'd make this function iterative instead of recursive you
could get rid of the unnecessary "node" parameter.

Just a personal preference, though, so feel free to keep it like that.

-  {
-    let value = node[property];
-    if (typeof value == "function")
-      value = value.call(node);
-
-    if (value && value.nodeType != Ci.nsIDOMNode.ELEMENT_NODE)
-      value = findElement(value, property);
-
-    return value;
-  }
-
-  this.tagName = {value: node.tagName, checked: false};
-
-  if (typeof parentNode == "undefined")
-  {
-    let parent = findElement(node, "parentNode");
-    parentNode = (parent ? new NodeData(parent) : null);
-  }
-  this.parentNode = parentNode;
-
-  let prevSibling = findElement(node, "prevSibling");

[Thomas Greiner, 2015/07/28 13:52:18]

This string should say "previousSibling" from what I see.

-  this.prevSibling = (prevSibling ? new NodeData(prevSibling, this.parentNode) : null);
-
-  if (parentNode && !prevSibling)
-    this.firstChild = {checked: false};
-
-  let nextSibling = findElement(node, "nextSibling");
-  if (parentNode && !nextSibling)
-    this.lastChild = {checked: false};
-
-  this.attributes = [];
-  for (var i = 0; i < node.attributes.length; i++) {
-    var attribute = node.attributes[i];
-    var data = {name: attribute.name, value: attribute.value, selected: attribute.value, checked: false};
-    if (data.name == "id" || data.name == "class")
-      this.attributes.unshift(data);
-    else
-      this.attributes.push(data);
-  }
-
-  if (this.attributes.length >= 2 && this.attributes[1].name == "id") {
-    // Make sure ID attribute comes first
-    var tmp = this.attributes[1];
-    this.attributes[1] = this.attributes[0];
-    this.attributes[0] = tmp;
-  }
-
-  this.customCSS = {selected: "", checked: false};
-}
-
-/*******************
  * TreeView object *
  *******************/
 
 function TreeView(tree) {
   var origView = tree.view;
   this.getRowProperties = TreeView_getRowProperties;
   this.getCellProperties = TreeView_getCellProperties;
 
   createQIProxy(this, origView);
 
@@ skipping 43 matching lines @@
 }
 
 function TreeView_getCellProperties(row, col) {
   this.getRowProperties(row);
 }
 
 /*********************
  * General functions *
  *********************/
 
-function init() {
-  let element = window.arguments[0];
-  doc = window.arguments[1] || element.ownerDocument;
-  let domain = window.arguments[2] || doc.defaultView.location.hostname;
+function init()
+{
+  nodeData = window.arguments[0];
+  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;
   }
 
-  nodeData = new NodeData(element);
   nodeData.tagName.checked = true;
   if (nodeData.attributes.length > 0)
   {
     let maxLen = 0;
     let bestAttr = null;
     for (let i = 0; i < nodeData.attributes.length; i++)
     {
       let len = nodeData.attributes[i].value.length;
       if ((nodeData.attributes[i].name == "id" || nodeData.attributes[i].name == "class") && len)
       {
@@ skipping 17 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);
 }