Fix data modification event/update

Author: janodvarko

lib/firequery-actor.js

@@ -84,7 +84,7 @@ var FireQueryActor = ActorClass(
     "data-modified": {
       type: "dataModified",
       node: Arg(0, "disconnectedNode"),
-      jQueryData: Arg(1, "nullable:json")
+      hasJQueryData: Arg(1, "boolean")
     }
   },
 
@@ -290,7 +290,7 @@ var FireQueryActor = ActorClass(
       patch: Arg(0, "string"),
       watcher: Arg(1, "string"),
       walker: Arg(2, "string"),
-      walker: Arg(3, "string")
+      console: Arg(3, "string")
     },
     response: {
       type: "jquery-patched"
@@ -300,40 +300,31 @@ var FireQueryActor = ActorClass(
   onJQueryDetected: makeInfallible(function(event) {
     let win = this.parent.window.wrappedJSObject;
 
-    Trace.sysout("FireQueryActor.onJQueryDetected; " + win.location, event);
+    Trace.sysout("FireQueryActor.onJQueryDetected; " +
+      win.location, this.patch);
 
     win.eval(this.patch);
   }),
 
   onDataModified: makeInfallible(function(event) {
     let win = this.parent.window.wrappedJSObject;
 
-    Trace.sysout("FireQueryActor.onDataModified; " + win.location, event);
-
+    // For cases where the DevTool itself are changing jQuery.data()
+    // Not necessary to cover these cases.
     if (ignoreEventParsers()) {
       return;
     }
 
     let walkerActor = this.conn.getActor(this.walkerActorID);
-    if (!walkerActor) {
-      return;
-    }
-
     let data = walkerActor.attachElement(event.target);
-    let jQueryData = hasJQueryData(event.target);
+    let available = !!hasJQueryData(event.target);
 
-    Trace.sysout("FireQueryActor.onDataModified;", {
+    Trace.sysout("FireQueryActor.onDataModified; " + win.location, {
       data: data,
-      jQueryData: jQueryData
+      hasJQueryData: available
     });
 
-    try {
-      // xxxHonza: circular data can't be stringified FIX ME.
-      let json = jQueryData ? JSON.stringify(jQueryData) : "";
-      Events.emit(this, "data-modified", data, json);
-    } catch(err) {
-      Trace.sysout("FireQueryActor.onDataModified; ERROR " + err, err);
-    }
+    Events.emit(this, "data-modified", data, available);
   }),
 
   /**

lib/inspector-overlay.js

@@ -267,32 +267,28 @@ const InspectorOverlay = Class(
 
   // Backend Events
 
-  onDataModified: function(nodeData, jQueryData) {
-    Trace.sysout("InspectorOverlay.onDataModified;", arguments);
+  onDataModified: function(nodeData, hasJQueryData) {
+    Trace.sysout("InspectorOverlay.onDataModified; has data: " +
+      hasJQueryData);
 
     let markupView = this.panel.markup;
-    if (!markupView) {
-      Trace.sysout("InspectorOverlay.onDataModified; ERROR No Markup view",
-        arguments);
-    }
-
     let client = this.toolbox.target.client;
-
     let nodeFront = nodeData.node;
+
+    // The container doesn't have to be always there (visible).
     let container = markupView.getContainer(nodeFront);
     if (!container) {
       Trace.sysout("InspectorOverlay.onDataModified; No Container", nodeData);
       return;
     }
 
-    let element = container.elt;
-
     // If jQuery data has been removed, remove also the little
-    // envelop icon from the UI; otherwise make sure it's there.
-    if (typeof jQueryData == "undefined") {
-      this.removeDataIcon(element);
-    } else {
+    // indicator icon from the UI; otherwise make sure it's there!
+    let element = container.elt;
+    if (hasJQueryData) {
       this.createDataIcon(element);
+    } else {
+      this.removeDataIcon(element);
     }
   },