Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1412029 - pass key shortcut id to aboutdevtools page;r=bgrins

Browse Source 
MozReview-Commit-ID: 4Fmj1p1bgsB

--HG--
extra : rebase_source : f236777ea914ebad6cc7a0e61be97491b6eb97c2
This commit is contained in:
Julian Descottes 2017-11-01 14:47:31 +01:00
parent e8f9b9e9a8
commit 2e31574d55
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
devtools/shim/devtools-startup.js
View File

@ -465,14 +465,15 @@ DevToolsStartup.prototype = {
},
onKey(window, key) {
// Record the timing at which this event started in order to compute later in
// gDevTools.showToolbox, the complete time it takes to open the toolbox.
// i.e. especially take `initDevTools` into account.
let startTime = window.performance.now();
let require = this.initDevTools("KeyShortcut");
if (require) {
// require might be null if initDevTools was called while DevTools are disabled.
if (!Services.prefs.getBoolPref(DEVTOOLS_ENABLED_PREF)) {
let id = key.toolId || key.id;
this.openInstallPage("KeyShortcut", id);
} else {
// Record the timing at which this event started in order to compute later in
// gDevTools.showToolbox, the complete time it takes to open the toolbox.
// i.e. especially take `initDevTools` into account.
let startTime = window.performance.now();
let require = this.initDevTools("KeyShortcut");
let { gDevToolsBrowser } = require("devtools/client/framework/devtools-browser");
gDevToolsBrowser.onKeyShortcut(window, key, startTime);
}
@ -528,7 +529,17 @@ DevToolsStartup.prototype = {
return require;
},
openInstallPage: function (reason) {
/**
* Open about:devtools to start the onboarding flow.
*
* @param {String} reason
* One of "KeyShortcut", "SystemMenu", "HamburgerMenu", "ContextMenu",
* "CommandLine".
* @param {String} keyId
* Optional. If the onboarding flow was triggered by a keyboard shortcut, pass
* the shortcut key id (or toolId) to about:devtools.
*/
openInstallPage: function (reason, keyId) {
let { gBrowser } = Services.wm.getMostRecentWindow("navigator:browser");
// Focus about:devtools tab if there is already one opened in the current window.
@ -556,6 +567,10 @@ DevToolsStartup.prototype = {
params.push("tabid=" + selectedBrowser.outerWindowID);
}
if (keyId) {
params.push("keyid=" + keyId);
}
if (params.length > 0) {
url += "?" + params.join("&");
}