Title: [108656] trunk/Source/WebCore
- Revision
- 108656
- Author
- pfeld...@chromium.org
- Date
- 2012-02-23 12:06:01 -0800 (Thu, 23 Feb 2012)
Log Message
Web Inspector: mad Redo to Cmd+Shift+Z, not Cmd+Y on a Mac.
https://bugs.webkit.org/show_bug.cgi?id=79341
Reviewed by Timothy Hatcher.
* inspector/front-end/ElementsPanel.js:
(WebInspector.ElementsPanel.prototype.handleShortcut):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (108655 => 108656)
--- trunk/Source/WebCore/ChangeLog 2012-02-23 20:02:28 UTC (rev 108655)
+++ trunk/Source/WebCore/ChangeLog 2012-02-23 20:06:01 UTC (rev 108656)
@@ -1,3 +1,13 @@
+2012-02-23 Pavel Feldman <pfeld...@chromium.org>
+
+ Web Inspector: mad Redo to Cmd+Shift+Z, not Cmd+Y on a Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=79341
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/front-end/ElementsPanel.js:
+ (WebInspector.ElementsPanel.prototype.handleShortcut):
+
2012-02-23 Ryosuke Niwa <rn...@webkit.org>
Mac build fix after 108629.
Modified: trunk/Source/WebCore/inspector/front-end/ElementsPanel.js (108655 => 108656)
--- trunk/Source/WebCore/inspector/front-end/ElementsPanel.js 2012-02-23 20:02:28 UTC (rev 108655)
+++ trunk/Source/WebCore/inspector/front-end/ElementsPanel.js 2012-02-23 20:06:01 UTC (rev 108656)
@@ -1049,13 +1049,15 @@
return;
}
- if (WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event) && event.keyIdentifier === "U+005A") { // Z key
+ if (WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event) && !event.shiftKey && event.keyIdentifier === "U+005A") { // Z key
WebInspector.domAgent.undo(this._updateSidebars.bind(this));
event.handled = true;
return;
}
- if (WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event) && event.keyIdentifier === "U+0059") { // Y key
+ var isRedoKey = WebInspector.isMac() ? event.metaKey && event.shiftKey && event.keyIdentifier === "U+005A" : // Z key
+ event.ctrlKey && event.keyIdentifier === "U+0059"; // Y key
+ if (isRedoKey) {
DOMAgent.redo(this._updateSidebars.bind(this));
event.handled = true;
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
