Commit 5112463b authored by Brian Grinstead's avatar Brian Grinstead
Browse files

Bug 1162848 - Make console 'clear' shortcut ctrl+shift+l on Windows / Linux;r=jryans 

--HG--
extra : commitid : HXC6aL41yU0
parent e21883e6

devtools/client/webconsole/test/browser_console_keyboard_accessibility.js

+2 −1
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ var test = asyncTest(function*() { 


  info("try ctrl-l to clear output");

  executeSoon(() => {

    EventUtils.synthesizeKey("l", { ctrlKey: true });

    let clearKey = hud.ui.window.document.querySelector("key[command=consoleCmd_clearOutput]:not([disabled])");

    synthesizeKeyFromKeyTag(clearKey);

  });

  yield hud.jsterm.once("messages-cleared");

devtools/client/webconsole/webconsole.js

+14 −12
Original line number Diff line number Diff line
@@ -15,24 +15,20 @@ loader.lazyServiceGetter(this, "clipboardHelper", 
                         "@mozilla.org/widget/clipboardhelper;1",

                         "nsIClipboardHelper");

loader.lazyImporter(this, "Services", "resource://gre/modules/Services.jsm");

loader.lazyGetter(this, "EventEmitter", () => require("devtools/shared/event-emitter"));

loader.lazyGetter(this, "AutocompletePopup",

                  () => require("devtools/client/shared/autocomplete-popup").AutocompletePopup);

loader.lazyGetter(this, "ToolSidebar",

                  () => require("devtools/client/framework/sidebar").ToolSidebar);

loader.lazyGetter(this, "ConsoleOutput",

                  () => require("devtools/client/webconsole/console-output").ConsoleOutput);

loader.lazyGetter(this, "Messages",

                  () => require("devtools/client/webconsole/console-output").Messages);

loader.lazyGetter(this, "asyncStorage",

                  () => require("devtools/shared/async-storage"));

loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/event-emitter");

loader.lazyRequireGetter(this, "AutocompletePopup", "devtools/client/shared/autocomplete-popup", true);

loader.lazyRequireGetter(this, "ToolSidebar", "devtools/client/framework/sidebar", true);

loader.lazyRequireGetter(this, "ConsoleOutput", "devtools/client/webconsole/console-output", true);

loader.lazyRequireGetter(this, "Messages", "devtools/client/webconsole/console-output", true);

loader.lazyRequireGetter(this, "asyncStorage", "devtools/shared/async-storage");

loader.lazyRequireGetter(this, "EnvironmentClient", "devtools/shared/client/main", true);

loader.lazyRequireGetter(this, "ObjectClient", "devtools/shared/client/main", true);

loader.lazyRequireGetter(this, "system", "devtools/shared/system");

loader.lazyRequireGetter(this, "Timers", "sdk/timers");

loader.lazyImporter(this, "VariablesView", "resource://devtools/client/shared/widgets/VariablesView.jsm");

loader.lazyImporter(this, "VariablesViewController", "resource://devtools/client/shared/widgets/VariablesViewController.jsm");

loader.lazyImporter(this, "PluralForm", "resource://gre/modules/PluralForm.jsm");

loader.lazyImporter(this, "gDevTools", "resource://devtools/client/framework/gDevTools.jsm");

loader.lazyGetter(this, "Timers", () => require("sdk/timers"));



const STRINGS_URI = "chrome://browser/locale/devtools/webconsole.properties";

var l10n = new WebConsoleUtils.l10n(STRINGS_URI);
@@ -528,6 +524,12 @@ WebConsoleFrame.prototype = { 


    let doc = this.document;



    if (system.constants.platform === "macosx") {

      doc.querySelector("#key_clearOSX").removeAttribute("disabled");

    } else {

      doc.querySelector("#key_clear").removeAttribute("disabled");

    }



    this.filterBox = doc.querySelector(".hud-filter-box");

    this.outputNode = doc.getElementById("output-container");

    this.completeNode = doc.querySelector(".jsterm-complete-node");

devtools/client/webconsole/webconsole.xul

+5 −1
Original line number Diff line number Diff line
@@ -62,7 +62,11 @@ function goUpdateConsoleCommands() { 
    <key key="&fullZoomResetCmd.commandkey2;" command="cmd_fullZoomReset" modifiers="accel"/>

    <key key="&findCmd.key;" command="cmd_find" modifiers="accel"/>

    <key key="&closeCmd.key;" command="cmd_close" modifiers="accel"/>

    <key key="&clearOutputCtrl.key;" command="consoleCmd_clearOutput" modifiers="control"/>



    <!-- The 'clear' key differs by plaform, so the correct one becomes

         enabled in JS -->

    <key id="key_clear" disabled="true" key="&clearOutputCtrl.key;" command="consoleCmd_clearOutput" modifiers="control shift"/>

    <key id="key_clearOSX" disabled="true" key="&clearOutputCtrl.key;" command="consoleCmd_clearOutput" modifiers="control"/>

  </keyset>

  <keyset id="editMenuKeys"/>