Changeset 52217 in webkit

Timestamp:

Dec 16, 2009 1:17:08 PM (14 years ago)

Author:

bweinstein@apple.com

Message:

Part of <​http://webkit.org/b/32568>.
Web Inspector: Context Menus should be used in more places.

Reviewed by Timothy Hatcher.

Add a context menu entry in the console to clear the console. This
is only shown when there is no user selection of text, because if
there is selection of the text, then we want to give the user the Copy +
Spell Check context menu that they are used to.

• English.lproj/localizedStrings.js: Added "Clear Console".
• inspector/front-end/ConsoleView.js:

(WebInspector.ConsoleView.prototype._handleContextMenuEvent):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-16  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Part of <http://webkit.org/b/32568>.
+        Web Inspector: Context Menus should be used in more places.
+        
+        Add a context menu entry in the console to clear the console. This
+        is only shown when there is no user selection of text, because if
+        there is selection of the text, then we want to give the user the Copy +
+        Spell Check context menu that they are used to.
+
+        * English.lproj/localizedStrings.js: Added "Clear Console".
+        * inspector/front-end/ConsoleView.js:
+        (WebInspector.ConsoleView.prototype._handleContextMenuEvent):
+
 2009-12-16  Brian Weinstein  <bweinstein@apple.com>
 

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

@@ -93 +93 @@
 
     var shortcut;
-    var handler = this.clearMessages.bind(this, true);
+    var clearConsoleHandler = this.clearMessages.bind(this, true);
 
     shortcut = WebInspector.KeyboardShortcut.makeKey("k", WebInspector.KeyboardShortcut.Modifiers.Meta);
-    this._shortcuts[shortcut] = handler;
+    this._shortcuts[shortcut] = clearConsoleHandler;
     this._shortcuts[shortcut].isMacOnly = true;
     shortcut = WebInspector.KeyboardShortcut.makeKey("l", WebInspector.KeyboardShortcut.Modifiers.Ctrl);
-    this._shortcuts[shortcut] = handler;
-
+    this._shortcuts[shortcut] = clearConsoleHandler;
+
+    // Since the Context Menu for the Console View will always be the same, we can create it in
+    // the constructor.
+    this._contextMenu = new WebInspector.ContextMenu();
+    this._contextMenu.appendItem(WebInspector.UIString("Clear Console"), clearConsoleHandler);
+    this.messagesElement.addEventListener("contextmenu", this._handleContextMenuEvent.bind(this), true);
+    
     this._customFormatters = {
         "object": this._formatobject,
@@ -372 +378 @@
         this.clearMessages(true);
     },
+    
+    _handleContextMenuEvent: function(event)
+    {
+        if (!window.getSelection().isCollapsed) {
+            // If there is a selection, we want to show our normal context menu
+            // (with Copy, etc.), and not Clear Console.
+            return;
+        }
+
+        this._contextMenu.show(event);
+    },
 
     _messagesSelectStart: function(event)