Title: [163305] releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI
- Revision
- 163305
- Author
- carlo...@webkit.org
- Date
- 2014-02-03 06:34:28 -0800 (Mon, 03 Feb 2014)
Log Message
Merge r163086 - Web Inspector: Implement open/close Console window shortcut
https://bugs.webkit.org/show_bug.cgi?id=127896
Patch by Diego Pino Garcia <dp...@igalia.com> on 2014-01-30
Reviewed by Timothy Hatcher.
* UserInterface/KeyboardShortcut.js:
(WebInspector.KeyboardShortcut.prototype.get displayName):
Bug: Option symbol should be displayed as Alternative symbol (\u2387)
in non Mac platforms.
* UserInterface/Main.js:
(WebInspector.contentLoaded):
Create keyboard shortcut for toggling console window.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/ChangeLog (163304 => 163305)
--- releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/ChangeLog 2014-02-03 14:32:18 UTC (rev 163304)
+++ releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/ChangeLog 2014-02-03 14:34:28 UTC (rev 163305)
@@ -1,3 +1,18 @@
+2014-01-30 Diego Pino Garcia <dp...@igalia.com>
+
+ Web Inspector: Implement open/close Console window shortcut
+ https://bugs.webkit.org/show_bug.cgi?id=127896
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/KeyboardShortcut.js:
+ (WebInspector.KeyboardShortcut.prototype.get displayName):
+ Bug: Option symbol should be displayed as Alternative symbol (\u2387)
+ in non Mac platforms.
+ * UserInterface/Main.js:
+ (WebInspector.contentLoaded):
+ Create keyboard shortcut for toggling console window.
+
2014-01-29 Diego Pino Garcia <dp...@igalia.com>
Web Inspector: [REGRESSION(r162931)] Tab navigation broken in DataGrid
Modified: releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/UserInterface/KeyboardShortcut.js (163304 => 163305)
--- releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/UserInterface/KeyboardShortcut.js 2014-02-03 14:32:18 UTC (rev 163304)
+++ releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/UserInterface/KeyboardShortcut.js 2014-02-03 14:34:28 UTC (rev 163305)
@@ -180,7 +180,7 @@
if (this._modifiers & WebInspector.KeyboardShortcut.Modifier.Control)
result += "\u2303";
if (this._modifiers & WebInspector.KeyboardShortcut.Modifier.Option)
- result += "\u2325";
+ result += InspectorFrontendHost.platform() === "mac" ? "\u2325" : "\u2387";
if (this._modifiers & WebInspector.KeyboardShortcut.Modifier.Shift)
result += "\u21e7";
if (this._modifiers & WebInspector.KeyboardShortcut.Modifier.Command)
Modified: releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/UserInterface/Main.js (163304 => 163305)
--- releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/UserInterface/Main.js 2014-02-03 14:32:18 UTC (rev 163304)
+++ releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/UserInterface/Main.js 2014-02-03 14:34:28 UTC (rev 163305)
@@ -225,6 +225,8 @@
this._reloadPageKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "R", this._reloadPage.bind(this));
this._reloadPageIgnoringCacheKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "R", this._reloadPageIgnoringCache.bind(this));
+ this._consoleKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Option | WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "C", this.toggleConsoleView.bind(this));
+
this._inspectModeKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "C", this._toggleInspectMode.bind(this));
this._undoKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "Z", this._undoKeyboardShortcut.bind(this));
@@ -257,9 +259,8 @@
this.toolbar.addToolbarItem(this.debuggerSidebarPanel.toolbarItem, WebInspector.Toolbar.Section.Left);
// The toolbar button for the console.
- const consoleKeyboardShortcut = "\u2325\u2318C"; // Option-Command-C
- var toolTip = WebInspector.UIString("Show console (%s)").format(consoleKeyboardShortcut);
- var activatedToolTip = WebInspector.UIString("Hide console");
+ var toolTip = WebInspector.UIString("Show console (%s)").format(WebInspector._consoleKeyboardShortcut.displayName);
+ var activatedToolTip = WebInspector.UIString("Hide console (%s)").format(WebInspector._consoleKeyboardShortcut.displayName);
this._consoleToolbarButton = new WebInspector.ActivateButtonToolbarItem("console", toolTip, activatedToolTip, WebInspector.UIString("Console"), "Images/NavigationItemLog.svg");
this._consoleToolbarButton.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this.toggleConsoleView, this);
this.toolbar.addToolbarItem(this._consoleToolbarButton, WebInspector.Toolbar.Section.Center);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
