Markup view customization (bug 1036949)

Author: janodvarko

lib/firequery-actor.js

@@ -363,7 +363,7 @@ function hasJQueryData(object) {
 
 // Patching NodeActor (add custom info into actor form)
 // xxxHonza: Bug 1036949 - New API: MarkupView customization
-let originalForm = NodeActor.prototype.form;
+/*let originalForm = NodeActor.prototype.form;
 NodeActor.prototype.form = function() {
   let form = originalForm.apply(this, arguments);
   if (!form.setProperty) {
@@ -377,7 +377,7 @@ NodeActor.prototype.form = function() {
     DebuggerServer.emit("domnode-form", this, form);
   }
   return form;
-}
+}*/
 
 // Exports from this module
 exports.FireQueryActor = FireQueryActor;

lib/inspector-overlay.js

@@ -50,11 +50,11 @@ const InspectorOverlay = Class(
     Trace.sysout("InspectorOverlay.initialize;", options);
 
     // MarkupView events
-    this.onMarkupViewRender = this.onMarkupViewRender.bind(this);
     this.onMarkupViewLoaded = this.onMarkupViewLoaded.bind(this);
     this.onMarkupViewUnloaded = this.onMarkupViewUnloaded.bind(this);
     this.onMarkupMutation = this.onMarkupMutation.bind(this);
     this.onInspectorUpdated = this.onInspectorUpdated.bind(this);
+    this.onMarkupViewContainerCreated = this.onMarkupViewContainerCreated.bind(this);
 
     // Tooltip events
     this.onClickTooltip = this.onClickTooltip.bind(this);
@@ -88,10 +88,10 @@ const InspectorOverlay = Class(
     Trace.sysout("InspectorOverlay.onBuild;", options);
 
     // Handle MarkupView events.
-    this.panel.on("markupview-render", this.onMarkupViewRender);
     this.panel.on("markuploaded", this.onMarkupViewLoaded);
     this.panel.on("markupmutation", this.onMarkupMutation);
     this.panel.on("inspector-updated", this.onInspectorUpdated);
+    this.panel.on("container-created", this.onMarkupViewContainerCreated)
 
     // Listen to {@FireQueryToolboxOverlay} events related to
     // backend actor attach and detach.
@@ -177,17 +177,29 @@ const InspectorOverlay = Class(
   },
 
   onInspectorUpdated: function(eventId, name) {
-    Trace.sysout("+++InspectorOverlay.onInspectorUpdated; " + name, arguments);
+    Trace.sysout("InspectorOverlay.onInspectorUpdated; " + name, arguments);
   },
 
   onMarkupMutation: function(eventId) {
-    Trace.sysout("+++InspectorOverlay.onMarkupMutation; ", arguments);
+    Trace.sysout("InspectorOverlay.onMarkupMutation; ", arguments);
   },
 
-  onMarkupViewRender: function(eventId, node, type, data, options) {
-    this.renderNode(node, type, data);
+  onMarkupViewContainerCreated: function(eventId, container) {
+    Trace.sysout("InspectorOverlay.onMarkupViewContainerCreated; ", arguments);
+
+    let nodeFront = container.node;
+    let hasJQueryData = nodeFront.getProperty ?
+      nodeFront.getProperty("hasJQueryData") :
+      nodeFront._form.props.hasJQueryData;
+
+    if (!hasJQueryData) {
+      return;
+    }
+
+    this.createDataIcon(container.elt);
   },
 
+  // xxxHonza: TODO remove
   renderNode: function(node, type, data) {
     if (type != "element") {
       return;

lib/markup-view-patch.js

@@ -25,6 +25,24 @@ MarkupView.prototype.template = function(aName, aDest, aOptions) {
   return node;
 }
 
+let originalImportNode = MarkupView.prototype.importNode;
+MarkupView.prototype.importNode = function(aNode, aFlashNode) {
+  let has = this._containers.has(aNode);
+  let container = originalImportNode.apply(this, arguments);
+
+  if (has) {
+    return container;
+  }
+
+  if (!container) {
+    return null;
+  }
+
+  //this._inspector.emit("container-created", container);
+
+  return container;
+}
+
 function shutdown() {
   MarkupView.prototype.template = originalTemplate;