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

lib/inspectorObserver.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 InspectorObserver =
 {
   init: function()
   {
@@ skipping 11 matching lines @@
     gDevTools.on("inspector-ready", this.inspectorReady);
     onShutdown.add(function()
     {
       gDevTools.off("inspector-ready", this.inspectorReady);
     }.bind(this));
   },
 
   get inspectorButtonTooltip()
   {
     // Randomize URI to work around bug 719376
     let stringBundle = Services.strings.createBundle("chrome://elemhidehelper/locale/global.properties?" + Math.random());

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

Here you're using "Services" without importing it first so why are you importing
it below?

     let result = stringBundle.GetStringFromName("inspector.button.tooltiptext");
 
     Object.defineProperty(this, "inspectorButtonTooltip", {value: result, enumerable: true});
     return this.inspectorButtonTooltip;
   },
 
   inspectorReady: function(eventName, toolbox, panel)
   {
     let panelWindow = panel.panelWin;
     let inspectBtn = panelWindow.document.getElementById("inspector-breadcrumbs");
     if (!inspectBtn)
       return;
 
     let tooltiptext = InspectorObserver.inspectorButtonTooltip;
     button = panelWindow.document.createElement("toolbarbutton");
     button.setAttribute("id", "ehh-inspector-toolbarbutton");
     button.setAttribute("class", "devtools-toolbarbutton");
     button.setAttribute("tooltiptext", tooltiptext);
     button.setAttribute("tabindex", "0");
     button.addEventListener("command", () =>
     {
-      let node = panel.selection.node;
-      let doc = null;
-      let domain = null;

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

This variable should be named "host" from looking at the rest of the code.

-      if (!node)
+      let node = panel.selection.nodeFront;
+      let target = panel.target;
+      if (node && target.form.elemhidehelper)
       {
-        // No local node available, but maybe a wrapper around a remote one
-        let {Services} = Cu.import("resource://gre/modules/Services.jsm");
-        node = panel.selection.nodeFront;
-        doc = panel.selection.documentFront;
-        host = Services.io.newURI(panel.target.url, null, null).host;
-      }
-      if (node.nodeType == Ci.nsIDOMNode.ELEMENT_NODE)
-      {
-        panelWindow.openDialog("chrome://elemhidehelper/content/composer.xul", "_blank",

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

Detail: Please break these lines accordingly to fit in the 80 characters limit.

-                               "chrome,centerscreen,resizable,dialog=no", node, doc, host);
+        target.client.request({
+          to: target.form.elemhidehelper,
+          type: "nodeinfo",
+          nodeActor: node.actorID
+        }, function(response)
+        {
+          if (!response.nodeData)
+            return;
+
+          panelWindow.openDialog("chrome://elemhidehelper/content/composer.xul",
+              "_blank", "chrome,centerscreen,resizable,dialog=no",
+              response.nodeData, response.host);
+        });
       }
     }, false);
 
     //Override button style for light DevTools theme
     let style = panelWindow.document.createProcessingInstruction("xml-stylesheet", 'href="chrome://elemhidehelper/skin/devToolsOverlay.css" type="text/css"');
     panelWindow.document.insertBefore(style, panelWindow.document.firstChild);
 
     inspectBtn.parentNode.insertBefore(button, inspectBtn);
   }
 };
 
 InspectorObserver.init();