Support for Fx39 and Fx40

Author: janodvarko

data/tooltip-provider.js

@@ -59,8 +59,28 @@ TooltipProvider.prototype =
   hasChildren: function(object) {
     if (object instanceof Property) {
       var value = this.getValue(object);
-      return (value && value.type == "object" &&
-        value.ownPropertyLength > 0);
+      if (!value) {
+        return false;
+      }
+
+      var hasChildren = value.ownPropertyLength > 0;
+
+      // xxxHonza: Support for Fx40 (grip.ownPropertyLength doesn't exist)
+      if (value.preview) {
+        hasChildren = hasChildren || value.preview.ownPropertiesLength > 0;
+      }
+
+      // xxxHonza: Support (rather a workaround) for Fx39
+      // (grip.preview.ownPropertiesLength doesn't exist)
+      if (value.preview) {
+        var preview = value.preview;
+        var kind = preview.kind;
+        var objectsWithProps = ["DOMNode", "ObjectWithURL"];
+        hasChildren = hasChildren || (objectsWithProps.indexOf(kind) != -1);
+        hasChildren = hasChildren || (kind == "ArrayLike" && preview.length > 0);
+      }
+
+      return (value.type == "object" && hasChildren);
     }
   },
 

lib/firequery-toolbox-overlay.js

@@ -118,32 +118,59 @@ const FireQueryToolboxOverlay = Class(
     return this.deferredAttach.promise;
   }),
 
+  detach: makeInfallible(function() {
+    Trace.sysout("FireQueryToolboxOverlay.detach;");
+
+    // xxxHonza: TODO
+
+    // Emit an event indicating that the detach process is done. This
+    // can be used e.g. by tests.
+    emit(this, "detach");
+  }),
+
   patchJQuery: function() {
     let deferred = defer();
 
     let patch = Http.getResource(JQUERYPATCH);
     let watcher = getJQueryWatcherCode();
-    let console = this.toolbox.target.activeConsole;
 
-    this.toolbox.initInspector().then(() => {
-      let walker = this.toolbox.walker;
-      this.front.patchJQuery(patch, watcher, walker, console).then(() => {
-        deferred.resolve();
+    // xxxHonza: activeConsole object has been introduced in Fx40
+    // It should be used instead of the tedious asynchronous
+    // process as soon as Fx40 is the minimum required version.
+    // We still need to call initInspector to get the walker though.
+    // let console = this.toolbox.target.activeConsole;
+    let target = this.toolbox.target;
+    target.activeTab.attachThread({}, (response, thread) => {
+      this.attachConsole(thread).then(console => {
+        this.toolbox.initInspector().then(() => {
+          let walker = this.toolbox.walker;
+          this.front.patchJQuery(patch, watcher, walker, console).then(() => {
+            deferred.resolve();
+          });
+        });
       });
     });
 
     return deferred.promise;
   },
 
-  detach: makeInfallible(function() {
-    Trace.sysout("FireQueryToolboxOverlay.detach;");
+  attachConsole: function(threadClient) {
+    let deferred = defer();
+    let debuggerClient = threadClient.client;
+    let consoleActor = this.toolbox.target.form.consoleActor;
 
-    // xxxHonza: TODO
+    debuggerClient.attachConsole(consoleActor, ["ConsoleAPI"],
+      (response, webConsoleClient) => {
 
-    // Emit an event indicating that the detach process is done. This
-    // can be used e.g. by tests.
-    emit(this, "detach");
-  }),
+      if (response.error) {
+        deferred.reject(response);
+      } else {
+        deferred.resolve(webConsoleClient);
+      }
+    });
+
+    return deferred.promise;
+  },
 
   getJQueryFront: function() {
     return this.attach();