Fix compatibility with Firefox Nightly

Author: janodvarko

chrome/skin/classic/shared/firequery.css

@@ -17,7 +17,8 @@
 /******************************************************************************/
 /* Toolbox Tooltip */
 
-/* Use !important to overload rules with theme prefixes */
+/* Use !important to overload rules with theme prefixes. Note that size
+  of the tooltip is dynamically computed in data-tooltip.js */
 .theme-tooltip-panel .panel-arrowcontent {
   padding: 0 !important;
 }

lib/data-tooltip.js

@@ -122,7 +122,7 @@ DataTooltip.prototype =
         "-theme.css", "author");
 
       // Theme paths have changed in Fx44. Also, it should be enough
-      // to included only them variables.
+      // to included only theme variables.
       loadSheet(win, "resource://devtools/client/themes/variables.css", "author");
 
       // The tooltip is opened for clicked jQuery data, so pass

lib/firequery-actor.js

@@ -12,22 +12,41 @@
 const { Cu, Ci, components } = require("chrome");
 const Events = require("sdk/event/core");
 
-// DevTools
-// See also: https://bugzilla.mozilla.org/show_bug.cgi?id=912121
-var devtools;
-try {
-  devtools = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}).devtools;
-} catch (err) {
-  devtools = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools;
+function safeImport(...args) {
+  for (var i=0; i<args.length; i++) {
+    try {
+      return Cu["import"](args[i], {});
+    }
+    catch (err) {
+    }
+  }
+  return {};
 }
 
-var DevToolsUtils;
-try {
-  DevToolsUtils = devtools["require"]("devtools/shared/DevToolsUtils");
-} catch (err) {
-  DevToolsUtils = devtools["require"]("devtools/toolkit/DevToolsUtils");
+function safeRequire(devtools, ...args) {
+  for (var i=0; i<args.length; i++) {
+    try {
+      return devtools["require"](args[i]);
+    }
+    catch (err) {
+    }
+  }
+  return {};
 }
 
+// DevTools
+// See also: https://bugzilla.mozilla.org/show_bug.cgi?id=912121
+const devtools = safeImport(
+  "resource://devtools/shared/Loader.jsm",
+  "resource://gre/modules/devtools/shared/Loader.jsm",
+  "resource://gre/modules/devtools/Loader.jsm"
+).devtools;
+
+const DevToolsUtils = safeRequire(devtools,
+  "devtools/shared/DevToolsUtils",
+  "devtools/toolkit/DevToolsUtils"
+);
+
 const { NodeActor } = devtools["require"]("devtools/server/actors/inspector");
 const makeInfallible = DevToolsUtils.makeInfallible;
 

lib/inspector-overlay.js

@@ -17,11 +17,6 @@ const { defer } = require("sdk/core/promise");
 // Firebug SDK
 const { devtools, safeRequire } = require("firebug.sdk/lib/core/devtools.js");
 
-// See also: https://bugzilla.mozilla.org/show_bug.cgi?id=912121
-var { MarkupView } = safeRequire(devtools,
-  "devtools/client/markupview/markup-view",
-  "devtools/markupview/markup-view");
-
 const { Trace, TraceError } = require("firebug.sdk/lib/core/trace.js").get(module.id);
 const { PanelOverlay } = require("firebug.sdk/lib/panel-overlay.js");
 const { Dom } = require("firebug.sdk/lib/core/dom.js");
@@ -358,29 +353,5 @@ const InspectorOverlay = Class(
   }
 });
 
-// Patching MarkupView (fire a new "container-created" event)
-// Bug 1036949 - New API: MarkupView customization
-// xxxHonza: Can be removed as soon as Fx42 is the
-// minimum required version.
-let originalImportNode = MarkupView.prototype.importNode;
-MarkupView.prototype.importNode = function(aNode, aFlashNode) {
-  if (!aNode) {
-    return null;
-  }
-
-  if (this._containers.has(aNode)) {
-    return this.getContainer(aNode);
-  }
-
-  let container = originalImportNode.apply(this, arguments);
-
-  // Feature detection based on nodeFront.getFormProperty() API
-  let nodeFront = container.node;
-  if (!nodeFront.getFormProperty) {
-    this._inspector.emit("container-created", container);
-  }
-
-  return container;
-}
 // Exports from this module
 exports.InspectorOverlay = InspectorOverlay;

package.json

@@ -15,7 +15,7 @@
   "homepage": "https://github.com/firebug/firequery/wiki",
   "forum": "https://groups.google.com/forum/#!forum/firebug",
   "engines": {
-    "firefox": ">=40.0a1"
+    "firefox": ">=42.0a1"
   },
   "license": "BSD-3-Clause",
   "repository": {