Adapt to the patch in bug 1036949

Author: janodvarko

lib/firequery-actor.js

@@ -307,12 +307,15 @@ var FireQueryActor = ActorClass(
 
   onDomNodeForm: makeInfallible(function(eventId, nodeActor, form) {
     let data = hasJQueryData(nodeActor.rawNode);
-    form.jQueryData = data;
 
-    if (data) {
-      Trace.sysout("FireQueryActor.onDomNodeForm; " +
-        JSON.stringify(data), arguments);
-    }
+    // Pass only a flag that says whether there are any jQuery
+    // data associated or not. The data itself will be fetched
+    // on demand (when displayed e.g. in a tooltip)
+    //form.setProperty("jQueryData", data);
+    form.setProperty("hasJQueryData", !!data)
+
+    let json = data ? JSON.stringify(data) : "";
+    Trace.sysout("FireQueryActor.onDomNodeForm; " + json, arguments);
   })
 });
 
@@ -363,7 +366,16 @@ function hasJQueryData(object) {
 let originalForm = NodeActor.prototype.form;
 NodeActor.prototype.form = function() {
   let form = originalForm.apply(this, arguments);
-  DebuggerServer.emit("domnode-form", this, form);
+  if (!form.setProperty) {
+    form.setProperty = (name, value) => {
+      if (!form.props) {
+        form.props = {};
+      }
+      form.props[name] = value;
+    };
+
+    DebuggerServer.emit("domnode-form", this, form);
+  }
   return form;
 }
 

lib/inspector-overlay.js

@@ -53,6 +53,8 @@ const InspectorOverlay = Class(
     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);
 
     // Tooltip events
     this.onClickTooltip = this.onClickTooltip.bind(this);
@@ -88,6 +90,8 @@ const InspectorOverlay = Class(
     // 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);
 
     // Listen to {@FireQueryToolboxOverlay} events related to
     // backend actor attach and detach.
@@ -172,6 +176,14 @@ const InspectorOverlay = Class(
     this.nodes = [];
   },
 
+  onInspectorUpdated: function(eventId, name) {
+    Trace.sysout("+++InspectorOverlay.onInspectorUpdated; " + name, arguments);
+  },
+
+  onMarkupMutation: function(eventId) {
+    Trace.sysout("+++InspectorOverlay.onMarkupMutation; ", arguments);
+  },
+
   onMarkupViewRender: function(eventId, node, type, data, options) {
     this.renderNode(node, type, data);
   },
@@ -181,11 +193,18 @@ const InspectorOverlay = Class(
       return;
     }
 
-    let value;
+    // Get custom 'hasJQueryData' property send from the backed.
+    // If the node has some jQuery data the property is set to true.
+    // xxxHonza: back compatibility, can be removed when
+    // Bug 1036949 - New API: MarkupView customization
+    // .. is in the release channel. It implements the
+    // nodeFront.getProperty() method.
     let nodeFront = data.node;
-    let jQueryData = nodeFront._form.jQueryData;
+    let hasJQueryData = nodeFront.getProperty ?
+      nodeFront.getProperty("hasJQueryData") :
+      nodeFront._form.props.hasJQueryData;
 
-    if (!jQueryData) {
+    if (!hasJQueryData) {
       return;
     }
 

lib/markup-view-patch.js

@@ -21,7 +21,7 @@ const { MarkupView } = devtools["require"]("devtools/markupview/markup-view");
 let originalTemplate = MarkupView.prototype.template;
 MarkupView.prototype.template = function(aName, aDest, aOptions) {
   let node = originalTemplate.apply(this, arguments);
-  this._inspector.emit("markupview-render", node, aName, aDest, aOptions);
+  //this._inspector.emit("markupview-render", node, aName, aDest, aOptions);
   return node;
 }