[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 22e1cd7b45a068a54640e2832ea37e4d0d5e9ca9
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 20 02:12:21 2009 +0000

    Fixes <http://webkit.org/b/22754>.
    Web Inspector: Keyboard shortcut for Element finder.
    
    Reviewed by Darin Adler.
    
    Use Command + Shift + C as a shortcut for Node Search, to
    match the Firebug shortcut to do the same thing.
    
    * inspector/front-end/ElementsPanel.js:
    (WebInspector.ElementsPanel.prototype.handleKeyEvent):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51225 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9dbd96f..6e80b2a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-19  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Fixes <http://webkit.org/b/22754>.
+        Web Inspector: Keyboard shortcut for Element finder.
+
+        Use Command + Shift + C as a shortcut for Node Search, to 
+        match the Firebug shortcut to do the same thing.
+
+        * inspector/front-end/ElementsPanel.js:
+        (WebInspector.ElementsPanel.prototype.handleKeyEvent):
+
 2009-11-19  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/inspector/front-end/ElementsPanel.js b/WebCore/inspector/front-end/ElementsPanel.js
index 959eeef..b319635 100644
--- a/WebCore/inspector/front-end/ElementsPanel.js
+++ b/WebCore/inspector/front-end/ElementsPanel.js
@@ -998,6 +998,22 @@ WebInspector.ElementsPanel.prototype = {
 
     handleKeyEvent: function(event)
     {
+        // Cmd/Control + Shift + C should be a shortcut to clicking the Node Search Button.
+        // This shortcut matches Firebug.
+        if (event.keyIdentifier === "U+0043") {     // C key
+            var isMac = InspectorController.platform().indexOf("mac-") === 0;
+            if (isMac)
+                var isNodeSearchKey = event.metaKey && !event.ctrlKey && !event.altKey && event.shiftKey;
+            else
+                var isNodeSearchKey = event.ctrlKey && !event.metaKey && !event.altKey && event.shiftKey;
+
+            if (isNodeSearchKey) {
+                this._nodeSearchButtonClicked(event);
+                event.preventDefault();
+                return;
+            }
+        }
+        
         this.treeOutline.handleKeyEvent(event);
     },
 

-- 
WebKit Debian packaging