Changeset 51961 in webkit

Timestamp:

Dec 10, 2009 1:54:34 PM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2009-12-10 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Timothy Hatcher.

Web Inspector: debugger shortcuts don't work when
Search field or Console drawer has focus.

​https://bugs.webkit.org/show_bug.cgi?id=32392

• inspector/front-end/inspector.js: (WebInspector.loaded): (WebInspector.documentKeyDown): (WebInspector.documentKeyUp): (WebInspector.searchKeyDown):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ElementsTreeOutline.js (modified) (1 diff)
• inspector/front-end/KeyboardShortcut.js (modified) (2 diffs)
• inspector/front-end/inspector.js (modified) (6 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-10  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: debugger shortcuts don't work when
+        Search field or Console drawer has focus.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32392
+
+        * inspector/front-end/inspector.js:
+        (WebInspector.loaded):
+        (WebInspector.documentKeyDown):
+        (WebInspector.documentKeyUp):
+        (WebInspector.searchKeyDown):
+
 2009-12-10  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/WebCore/inspector/front-end/ElementsTreeOutline.js

@@ -198 +198 @@
             return;
 
-        // Delete or backspace pressed, delete the node.
-        if (event.keyCode === 8 || event.keyCode === 46) {
+        if (event.keyCode === WebInspector.KeyboardShortcut.KeyCodes.Backspace ||
+                event.keyCode === WebInspector.KeyboardShortcut.KeyCodes.Delete) {
             selectedElement.remove();
             event.preventDefault();

trunk/WebCore/inspector/front-end/KeyboardShortcut.js

@@ -45 +45 @@
 
 WebInspector.KeyboardShortcut.KeyCodes = {
+    Backspace: 8,
     Esc: 27,
     Space: 32,
@@ -55 +56 @@
     Right: 39,       // also NUM_EAST
     Down: 40,        // also NUM_SOUTH
+    Delete: 46,
     F1: 112,
     F2: 113,

trunk/WebCore/inspector/front-end/inspector.js

@@ -483 +483 @@
 
     var mainPanelsElement = document.getElementById("main-panels");
-    mainPanelsElement.handleKeyEvent = this.mainKeyDown.bind(this);
-    mainPanelsElement.handleKeyUpEvent = this.mainKeyUp.bind(this);
     mainPanelsElement.handleCopyEvent = this.mainCopy.bind(this);
 
@@ -641 +639 @@
 WebInspector.documentKeyDown = function(event)
 {
-    if (!this.currentFocusElement)
-        return;
-    if (this.currentFocusElement.handleKeyEvent)
-        this.currentFocusElement.handleKeyEvent(event);
-    else if (this.currentFocusElement.id && this.currentFocusElement.id.length && WebInspector[this.currentFocusElement.id + "KeyDown"])
-        WebInspector[this.currentFocusElement.id + "KeyDown"](event);
+    if (this.currentFocusElement) {
+        if (this.currentFocusElement.handleKeyEvent)
+            this.currentFocusElement.handleKeyEvent(event);
+        else if (this.currentFocusElement.id && this.currentFocusElement.id.length && WebInspector[this.currentFocusElement.id + "KeyDown"])
+            WebInspector[this.currentFocusElement.id + "KeyDown"](event);
+        if (event.handled)
+            return;
+    }
+
+    if (this.currentPanel && this.currentPanel.handleKeyEvent)
+        this.currentPanel.handleKeyEvent(event);
 
     if (!event.handled) {
@@ -731 +734 @@
 WebInspector.documentKeyUp = function(event)
 {
-    if (!this.currentFocusElement || !this.currentFocusElement.handleKeyUpEvent)
-        return;
-    this.currentFocusElement.handleKeyUpEvent(event);
+    if (this.currentFocusElement) {
+        if (this.currentFocusElement.handleKeyUpEvent)
+            this.currentFocusElement.handleKeyUpEvent(event);
+        if (event.handled)
+            return;
+    }
+
+    if (this.currentPanel && this.currentPanel.handleKeyUpEvent)
+        this.currentPanel.handleKeyUpEvent(event);
 }
 
@@ -761 +770 @@
     if (event.handled || event.target.hasStyleClass("popup-glasspane"))
         event.preventDefault();
-}
-
-WebInspector.mainKeyDown = function(event)
-{
-    if (this.currentPanel && this.currentPanel.handleKeyEvent)
-        this.currentPanel.handleKeyEvent(event);
-}
-
-WebInspector.mainKeyUp = function(event)
-{
-    if (this.currentPanel && this.currentPanel.handleKeyUpEvent)
-        this.currentPanel.handleKeyUpEvent(event);
 }
 
@@ -1551 +1548 @@
     if (event.keyCode === WebInspector.KeyboardShortcut.KeyCodes.Esc) {
         event.preventDefault();
-        event.handled = true;
+        // When search was selected manually and is currently blank, we'd like Esc stay unhandled
+        // and hit console drawer handler.
+        event.handled = !(this.previousFocusElement === event.target && event.target.value === "");
         event.target.value = "";
 
@@ -1558 +1557 @@
         if (this.currentFocusElement === event.target)
             this.currentFocusElement.select();
-
+        return false;
+    } else if (event.keyCode === WebInspector.KeyboardShortcut.KeyCodes.Backspace ||
+               event.keyCode === WebInspector.KeyboardShortcut.KeyCodes.Delete) {
+        event.handled = true;
         return false;
     }