Skip to content
This repository has been archived by the owner on Jan 19, 2022. It is now read-only.

Update paths after DevTools file migration #19

Merged
merged 2 commits into from
Sep 29, 2015
Merged

Conversation

jryans
Copy link
Contributor

@jryans jryans commented Sep 28, 2015

r? @ochameau

Still not functional of course, needs the TCPSocket fix.

Tested on Firefox 44 and 42.

({ ConsoleAPI } = Cu.import("resource://gre/modules/devtools/shared/Console.jsm"));
} catch (e) {
({ ConsoleAPI } = Cu.import("resource://gre/modules/devtools/Console.jsm"));
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't you also use require("devtools/import") for Console.jsm?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have require until the SDK loader is initialized a few lines later, and the console object we're creating is part of the loader's initialization options, so this seemed the simplest thing to do here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah ok...

@ochameau
Copy link
Contributor

r+, tested against nightly and release, works fine without seeing much exception.

jryans added a commit that referenced this pull request Sep 29, 2015
Update paths after DevTools file migration
@jryans jryans merged commit 873d3c7 into mozilla:master Sep 29, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
2 participants