[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit fd6712f7df6e6648025235fd9948d7f0a90fd461
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 17 12:52:18 2010 +0000

    2010-12-17  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: [REGRESSION] Cmd (Ctrl) + G does not search next in Scripts panel.
            https://bugs.webkit.org/show_bug.cgi?id=50893
    
            Now Mac shortcuts are:
            - Cmd F/G = find / next
            - Cmd L = go to line
    
            Win/Linux:
            - Ctrl+G = go to line
    
            * inspector/front-end/ScriptsPanel.js:
            (WebInspector.ScriptsPanel.prototype._registerShortcuts):
            * inspector/front-end/inspector.js:
            (WebInspector._registerShortcuts):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74253 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2697977..6c93127 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-12-17  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: [REGRESSION] Cmd (Ctrl) + G does not search next in Scripts panel.
+        https://bugs.webkit.org/show_bug.cgi?id=50893
+
+        Now Mac shortcuts are:
+        - Cmd F/G = find / next
+        - Cmd L = go to line
+
+        Win/Linux:
+        - Ctrl+G = go to line
+
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype._registerShortcuts):
+        * inspector/front-end/inspector.js:
+        (WebInspector._registerShortcuts):
+
 2010-12-16  Sergio Villar Senin  <svillar at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebCore/inspector/front-end/ScriptsPanel.js b/WebCore/inspector/front-end/ScriptsPanel.js
index b12e58a..9d06304 100644
--- a/WebCore/inspector/front-end/ScriptsPanel.js
+++ b/WebCore/inspector/front-end/ScriptsPanel.js
@@ -983,7 +983,11 @@ WebInspector.ScriptsPanel.prototype = {
         this._shortcuts[shortcut2.key] = handler;
         section.addAlternateKeys([ shortcut1.name, shortcut2.name ], WebInspector.UIString("Step out"));
 
-        shortcut1 = WebInspector.KeyboardShortcut.makeDescriptor("g", platformSpecificModifier);
+        var isMac = WebInspector.isMac();
+        if (isMac)
+            shortcut1 = WebInspector.KeyboardShortcut.makeDescriptor("l", WebInspector.KeyboardShortcut.Modifiers.Meta);
+        else
+            shortcut1 = WebInspector.KeyboardShortcut.makeDescriptor("g", WebInspector.KeyboardShortcut.Modifiers.Ctrl);
         this._shortcuts[shortcut1.key] = this.showGoToLineDialog.bind(this);
         section.addAlternateKeys([ shortcut1.name ], WebInspector.UIString("Go to Line"));
         this.sidebarPanes.callstack.registerShortcuts(section);
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js
index 98c398c..84321c1 100644
--- a/WebCore/inspector/front-end/inspector.js
+++ b/WebCore/inspector/front-end/inspector.js
@@ -789,11 +789,13 @@ WebInspector._registerShortcuts = function()
     section.addRelatedKeys(keys, WebInspector.UIString("Next/previous panel"));
     section.addKey(shortcut.shortcutToString(shortcut.Keys.Esc), WebInspector.UIString("Toggle console"));
     section.addKey(shortcut.shortcutToString("f", shortcut.Modifiers.CtrlOrMeta), WebInspector.UIString("Search"));
-    keys = [
-        shortcut.shortcutToString("g", shortcut.Modifiers.CtrlOrMeta),
-        shortcut.shortcutToString("g", shortcut.Modifiers.CtrlOrMeta | shortcut.Modifiers.Shift)
-    ];
-    section.addRelatedKeys(keys, WebInspector.UIString("Find next/previous"));
+    if (WebInspector.isMac()) {
+        keys = [
+            shortcut.shortcutToString("g", shortcut.Modifiers.Meta),
+            shortcut.shortcutToString("g", shortcut.Modifiers.Meta | shortcut.Modifiers.Shift)
+        ];
+        section.addRelatedKeys(keys, WebInspector.UIString("Find next/previous"));
+    }
 }
 
 WebInspector.documentKeyDown = function(event)
@@ -875,12 +877,7 @@ WebInspector.documentKeyDown = function(event)
             break;
 
         case "U+0047": // G key
-            if (isMac)
-                var isFindAgainKey = event.metaKey && !event.ctrlKey && !event.altKey;
-            else
-                var isFindAgainKey = event.ctrlKey && !event.metaKey && !event.altKey;
-
-            if (isFindAgainKey) {
+            if (isMac && event.metaKey && !event.ctrlKey && !event.altKey) {
                 if (event.shiftKey) {
                     if (this.currentPanel.jumpToPreviousSearchResult)
                         this.currentPanel.jumpToPreviousSearchResult();
@@ -888,7 +885,6 @@ WebInspector.documentKeyDown = function(event)
                     this.currentPanel.jumpToNextSearchResult();
                 event.preventDefault();
             }
-
             break;
 
         // Windows and Mac have two different definitions of [, so accept both.

-- 
WebKit Debian packaging