Bug 1308441 - Remove commonLibRequire trick r?honza
MozReview-Commit-ID: 2bTs19UK9dJ
--- a/devtools/client/netmonitor/netmonitor.js
+++ b/devtools/client/netmonitor/netmonitor.js
@@ -8,17 +8,16 @@
const { BrowserLoader } = Components.utils.import("resource://devtools/client/shared/browser-loader.js", {});
var Netmonitor = {
bootstrap: ({ tabTarget, toolbox }) => {
const require = window.windowRequire = BrowserLoader({
baseURI: "resource://devtools/client/netmonitor/",
window,
- commonLibRequire: toolbox.browserRequire,
}).require;
const EventEmitter = require("devtools/shared/event-emitter");
const { createFactory } = require("devtools/client/shared/vendor/react");
const { render } = require("devtools/client/shared/vendor/react-dom");
const Provider = createFactory(require("devtools/client/shared/vendor/react-redux").Provider);
const { configureStore } = require("./store");
const store = window.gStore = configureStore();
--- a/devtools/client/shared/vendor/react-dom.js
+++ b/devtools/client/shared/vendor/react-dom.js
@@ -145,21 +145,18 @@
function getToolboxDocIfXulOnly(node) {
// This execution context doesn't know about XULDocuments, so don't get the toolbox.
if (typeof XULDocument !== "function") {
return null;
}
let doc = node.ownerDocument;
const inspectorUrl = "chrome://devtools/content/inspector/inspector.xhtml";
- const netMonitorUrl = "chrome://devtools/content/netmonitor/netmonitor.xhtml";
- while (doc instanceof XULDocument ||
- doc.location.href === inspectorUrl ||
- doc.location.href === netMonitorUrl) {
+ while (doc instanceof XULDocument || doc.location.href === inspectorUrl) {
const {frameElement} = doc.defaultView;
if (!frameElement) {
// We're at the root element, and no toolbox was found.
return null;
}
doc = frameElement.parentElement.ownerDocument;