Remove obsolete data

Author: janodvarko

data/markup-view-content.js

@@ -64,17 +64,12 @@ const InspectorOverlay = Class(
     // Tooltip events
     this.onClickTooltip = this.onClickTooltip.bind(this);
 
-    // Handler for messages from MarkupView content.
-    this.onContentMessage = this.onContentMessage.bind(this);
-
     // FireQueryToolboxOverlay events
     this.onAttach = this.onAttach.bind(this);
     this.onDetach = this.onDetach.bind(this);
 
     // Backend events
     this.onDataModified = this.onDataModified.bind(this);
-
-    this.nodes = [];
   },
 
   destroy: function() {
@@ -131,60 +126,10 @@ const InspectorOverlay = Class(
     frame.addEventListener("unload", this.onMarkupViewUnloaded, true);
 
     loadSheet(win, "chrome://firequery/skin/firequery.css", "author");
-    //loadSheet(win, "chrome://firebug.sdk/skin/domTree.css", "author");
-
-    // xxxHonza: The inspector panel doesn't render jQuery data directly
-    // anymore. It's only displaying a little icon (an envelope) that
-    // indicates presence of data. The user can see details in a tooltip
-    // after clicking the icon.
-    return;
-
-    let requireUrl = self.data.url("./lib/require.js");
-    let configUrl = self.data.url("./inspector-config.js");
-
-    // Require configuration script. It's hardcoded here, so the
-    // base URL can be dynamically provided. Note that base URL of
-    // the markup frame is pointing into native DevTools chrome location.
-    // xxxHonza: should be in a *.js file
-    let configScript =
-      "require.config({" +
-      "  baseUrl: '" + self.data.url() + "'," +
-      "  paths: {" +
-      "    'react': './lib/react'," +
-      "    'firebug.sdk': '../node_modules/firebug.sdk'," +
-      "    'reps': '../node_modules/firebug.sdk/lib/reps'," +
-      "  }" +
-      "});" +
-      "requirejs(['markup-view-content']);";
-
-    // First, load RequireJS library.
-    Dom.loadScript(doc, requireUrl, event => {
-      // As soon as the RequireJS library is loaded, execute also
-      // configuration script that loads the main module.
-      Dom.addScript(doc, "firequery-inspector-config", configScript);
-
-      // Listen for messages from the content. The communication
-      // is done through DOM events since the message manager
-      // isn't available for the markup frame.
-      win.addEventListener("firequery/content/message",
-        this.onContentMessage, true);
-
-      // xxxHonza: expose tracing to the content.
-    });
-
-    let ContentTrace = {
-      sysout: () => FBTrace.sysout.apply(FBTrace, arguments)
-    }
-
-    // Expose tracing into the MarkupView content.
-    Content.exportIntoContentScope(win, ContentTrace, "Trace");
   },
 
   onMarkupViewUnloaded: function() {
     Trace.sysout("InspectorOverlay.onMarkupViewUnloaded;");
-
-    this.markupScriptReady = false;
-    this.nodes = [];
   },
 
   onInspectorUpdated: function(eventId, name) {
@@ -288,8 +233,6 @@ const InspectorOverlay = Class(
   },
 
   showDOMProperties: function() {
-    Trace.sysout("InspectorOverlay.showDOMProperties;", this.panel);
-
     let original = this.showDOMPropertiesOriginal;
 
     // The user needs to click on the jQueryData element (an envelope)
@@ -305,6 +248,8 @@ const InspectorOverlay = Class(
       return original.apply(this.panel, arguments);
     }
 
+    Trace.sysout("InspectorOverlay.showDOMProperties;", jQueryData);
+
     // Display clicked jQuery data instead of element properties.
     this.toolbox.openSplitConsole().then(() => {
       let panel = this.toolbox.getPanel("webconsole");
@@ -319,17 +264,6 @@ const InspectorOverlay = Class(
     });
   },
 
-  onMarkupScriptReady: function() {
-    Trace.sysout("InspectorOverlay.onMarkupScriptReady; " +
-      this.nodes.length, this.nodes);
-
-    this.markupScriptReady = true;
-
-    if (this.nodes.length) {
-      this.postContentMessage("render", this.nodes);
-    }
-  },
-
   // ToolboxOverlay Events
 
   onAttach: function(front) {
@@ -375,48 +309,6 @@ const InspectorOverlay = Class(
     } else {
       this.createDataIcon(element);
     }
-
-    /*let nodes = [{
-      element: container.elt,
-      jQueryData: jQueryData
-    }];*/
-
-    // Re-render nodes within the MarkupView frame.
-    //this.postContentMessage("render", nodes);
-  },
-
-  // Communication: content <-> chrome
-
-  onContentMessage: function(event) {
-    Trace.sysout("InspectorOverlay.onContentMessage; ", event);
-
-    let { data } = event;
-    switch (data.type) {
-    case "ready":
-      this.onMarkupScriptReady();
-      break;
-    }
-  },
-
-  /**
-   * Send message to the content scope (panel's iframe)
-   */
-  postContentMessage: function(type, args) {
-    let frame = this.panel._markupFrame;
-    let win = frame.contentWindow;
-
-    var data = {
-      type: type,
-      args: args,
-    };
-
-    var event = new win.MessageEvent("firequery/chrome/message", {
-      bubbles: true,
-      cancelable: true,
-      data: data,
-    });
-
-    win.dispatchEvent(event);
   },
 });