Changeset 94758 in webkit

Timestamp:

Sep 8, 2011 6:58:27 AM (13 years ago)

Author:

apavlov@chromium.org

Message:

Web Inspector: [REGRESSION] Clear console shortcut Ctrl + L broken
​https://bugs.webkit.org/show_bug.cgi?id=67711

Reviewed by Yury Semikhatsky.

• inspector/front-end/ConsoleView.js:

(WebInspector.ConsoleView.prototype._consoleCleared):
(WebInspector.ConsoleView.prototype._registerShortcuts):
(WebInspector.ConsoleView.prototype._promptKeyDown):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-08  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: [REGRESSION] Clear console shortcut Ctrl + L broken
+        https://bugs.webkit.org/show_bug.cgi?id=67711
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/front-end/ConsoleView.js:
+        (WebInspector.ConsoleView.prototype._consoleCleared):
+        (WebInspector.ConsoleView.prototype._registerShortcuts):
+        (WebInspector.ConsoleView.prototype._promptKeyDown):
+
 2011-09-08  Andras Becsi  <andras.becsi@nokia.com>
 

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

@@ -490 +490 @@
 
         var shortcut = WebInspector.KeyboardShortcut;
-        var shortcutK = shortcut.makeDescriptor("k", WebInspector.KeyboardShortcut.Modifiers.Meta);
-        // This case requires a separate bound function as its isMacOnly property should not be shared among different shortcut handlers.
-        var clearConsoleHandler = this._requestClearMessages.bind(this);
-        this._shortcuts[shortcutK.key] = clearConsoleHandler;
-        this._shortcuts[shortcutK.key].isMacOnly = true;
+
+        if (WebInspector.isMac()) {
+            var shortcutK = shortcut.makeDescriptor("k", WebInspector.KeyboardShortcut.Modifiers.Meta);
+            this._shortcuts[shortcutK.key] = this._requestClearMessages.bind(this);
+        }
 
         var shortcutL = shortcut.makeDescriptor("l", WebInspector.KeyboardShortcut.Modifiers.Ctrl);
-        this._shortcuts[shortcutL.key] = clearConsoleHandler;
+        this._shortcuts[shortcutL.key] = this._requestClearMessages.bind(this);
 
         var section = WebInspector.shortcutsScreen.section(WebInspector.UIString("Console"));
@@ -538 +538 @@
         var handler = this._shortcuts[shortcut];
         if (handler) {
-            if (!this._shortcuts[shortcut].isMacOnly || WebInspector.isMac()) {
-                handler();
-                event.preventDefault();
-                return;
-            }
+            handler();
+            event.preventDefault();
+            return;
         }
     },