Title: [98952] trunk/Source/WebCore
- Revision
- 98952
- Author
- [email protected]
- Date
- 2011-11-01 05:36:00 -0700 (Tue, 01 Nov 2011)
Log Message
Web Inspector: do not switch panels on Cmd + -> while in console.
https://bugs.webkit.org/show_bug.cgi?id=71281
Reviewed by Yury Semikhatsky.
* inspector/front-end/InspectorView.js:
(WebInspector.InspectorView.prototype._keyDown):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (98951 => 98952)
--- trunk/Source/WebCore/ChangeLog 2011-11-01 12:34:15 UTC (rev 98951)
+++ trunk/Source/WebCore/ChangeLog 2011-11-01 12:36:00 UTC (rev 98952)
@@ -1,3 +1,13 @@
+2011-11-01 Pavel Feldman <[email protected]>
+
+ Web Inspector: do not switch panels on Cmd + -> while in console.
+ https://bugs.webkit.org/show_bug.cgi?id=71281
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/front-end/InspectorView.js:
+ (WebInspector.InspectorView.prototype._keyDown):
+
2011-11-01 Zeno Albisser <[email protected]>
[Qt] bad codegen, pointer diff in JSC::JSCallbackConstructor::JSCallbackConstructor
Modified: trunk/Source/WebCore/inspector/front-end/InspectorView.js (98951 => 98952)
--- trunk/Source/WebCore/inspector/front-end/InspectorView.js 2011-11-01 12:34:15 UTC (rev 98951)
+++ trunk/Source/WebCore/inspector/front-end/InspectorView.js 2011-11-01 12:36:00 UTC (rev 98952)
@@ -87,23 +87,25 @@
_keyDown: function(event)
{
+ var isInEditMode = event.target.enclosingNodeOrSelfWithClass("text-prompt") || WebInspector.isEditingAnyField();
+
switch (event.keyIdentifier) {
case "Left":
- var isBackKey = WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event);
+ var isBackKey = !isInEditMode && WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event);
if (isBackKey && this._canGoBackInHistory()) {
this._goBackInHistory();
event.preventDefault();
}
break;
-
+
case "Right":
- var isForwardKey = WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event);
+ var isForwardKey = !isInEditMode && WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event);
if (isForwardKey && this._canGoForwardInHistory()) {
this._goForwardInHistory();
event.preventDefault();
}
break;
-
+
// Windows and Mac have two different definitions of [, so accept both.
case "U+005B":
case "U+00DB": // [ key
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
