Skip to content
This repository was archived by the owner on Aug 13, 2018. It is now read-only.

Commit c3e7cc9

Browse files
committed
Fix gDevTools getter in the actor module (backend)
1 parent 7560d7d commit c3e7cc9

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

lib/wsm-actor.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,18 @@ const Events = require("sdk/event/core");
1313

1414
// DevTools
1515
// See also: https://bugzilla.mozilla.org/show_bug.cgi?id=912121
16+
// We can't use the core/devtools.js module since this code is
17+
// executed on the backend.
1618
var devtools;
1719
try {
18-
devtools = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}).devtools;
20+
devtools = Cu.import("resource://devtools/shared/Loader.jsm", {}).devtools;
1921
} catch (err) {
20-
devtools = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools;
22+
try {
23+
devtools = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}).devtools;
24+
} catch (err) {
25+
devtools = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools;
26+
}
2127
}
22-
2328
const { expectState } = devtools["require"]("devtools/server/actors/common");
2429
const protocol = devtools["require"]("devtools/server/protocol");
2530

0 commit comments

Comments
 (0)