#22 (wip) fix few exceptions

Author: janodvarko

lib/firequery-actor.js

@@ -168,9 +168,11 @@ var FireQueryActor = ActorClass(
     Events.off(NodeActor, "form", this.onNodeActorForm);
 
     // Remove (content) window listeners.
-    let win = this.parent.window.wrappedJSObject;
-    win.removeEventListener("jQueryDetected", this.onJQueryDetected, true);
-    win.removeEventListener("firequery-event", this.onDataModified, true);
+    if (this.patch) {
+      let win = this.parent.window.wrappedJSObject;
+      win.removeEventListener("jQueryDetected", this.onJQueryDetected, true);
+      win.removeEventListener("firequery-event", this.onDataModified, true);
+    }
 
     // Remove previewer listener (web console).
     removeItem(Previewers.Object, this.onBuildPreview);
@@ -318,7 +320,9 @@ var FireQueryActor = ActorClass(
     });
 
     try {
-      Events.emit(this, "data-modified", data, jQueryData);
+      // 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);
     }
@@ -365,8 +369,6 @@ var FireQueryActor = ActorClass(
     // data associated or not. The data itself will be fetched
     // on demand (when displayed e.g. in a tooltip)
     form.setFormProperty("hasJQueryData", !!data);
-
-    let json = data ? JSON.stringify(data) : "";
   })
 });
 

lib/inspector-overlay.js

@@ -92,7 +92,12 @@ const InspectorOverlay = Class(
     Trace.sysout("InspectorOverlay.onBuild;", options);
 
     // Handle MarkupView events.
-    this.panel.on("markuploaded", this.onMarkupViewLoaded);
+
+    // 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.
+    //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)
@@ -344,6 +349,11 @@ const InspectorOverlay = Class(
     Trace.sysout("InspectorOverlay.onDataModified;", arguments);
 
     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;