Changeset 142142 in webkit

Timestamp:

Feb 7, 2013 9:46:41 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: home button behaviour is wrong in DTE
​https://bugs.webkit.org/show_bug.cgi?id=109154

Patch by Andrey Lushnikov <​lushnikov@chromium.org> on 2013-02-07
Reviewed by Vsevolod Vlasov.

Source/WebCore:

Handle home key shortcut explicitly in TextEditorMainPanel.

New test: inspector/editor/text-editor-home-button.html

• inspector/front-end/DefaultTextEditor.js:

(WebInspector.TextEditorMainPanel.prototype._registerShortcuts):
(WebInspector.TextEditorMainPanel.prototype._handleHomeKey):

LayoutTests:

Add layout test to verify home button behaviour. Exclude this test on
platforms that do not have eventSender object in test shell.

• inspector/editor/text-editor-home-button-expected.txt: Added.
• inspector/editor/text-editor-home-button.html: Added.
• platform/efl/TestExpectations:
• platform/mac/TestExpectations:
• platform/qt/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/editor/text-editor-home-button-expected.txt (added)
• LayoutTests/inspector/editor/text-editor-home-button.html (added)
• LayoutTests/platform/efl/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• LayoutTests/platform/qt/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/DefaultTextEditor.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-07  Andrey Lushnikov  <lushnikov@chromium.org>
+
+        Web Inspector: home button behaviour is wrong in DTE
+        https://bugs.webkit.org/show_bug.cgi?id=109154
+
+        Reviewed by Vsevolod Vlasov.
+
+        Add layout test to verify home button behaviour. Exclude this test on
+        platforms that do not have eventSender object in test shell.
+
+        * inspector/editor/text-editor-home-button-expected.txt: Added.
+        * inspector/editor/text-editor-home-button.html: Added.
+        * platform/efl/TestExpectations:
+        * platform/mac/TestExpectations:
+        * platform/qt/TestExpectations:
+
 2013-02-07  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/LayoutTests/platform/efl/TestExpectations

@@ -1820 +1820 @@
 inspector/editor/text-editor-formatter.html
 inspector/editor/text-editor-word-jumps.html
+inspector/editor/text-editor-home-button.html
 
 # Remove from list after enabling CANVAS_PATH

trunk/LayoutTests/platform/mac/TestExpectations

@@ -255 +255 @@
 inspector/editor/text-editor-formatter.html [ Skip ]
 inspector/editor/text-editor-word-jumps.html [ Skip ]
+inspector/editor/text-editor-home-button.html [ Skip ]
 
 # https://bugs.webkit.org/show_bug.cgi?id=71120

trunk/LayoutTests/platform/qt/TestExpectations

@@ -2602 +2602 @@
 inspector/editor/text-editor-formatter.html
 inspector/editor/text-editor-word-jumps.html
+inspector/editor/text-editor-home-button.html
 
 # Needs rebaseline after https://bugs.webkit.org/show_bug.cgi?id=14664

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-07  Andrey Lushnikov  <lushnikov@chromium.org>
+
+        Web Inspector: home button behaviour is wrong in DTE
+        https://bugs.webkit.org/show_bug.cgi?id=109154
+
+        Reviewed by Vsevolod Vlasov.
+
+        Handle home key shortcut explicitly in TextEditorMainPanel.
+
+        New test: inspector/editor/text-editor-home-button.html
+
+        * inspector/front-end/DefaultTextEditor.js:
+        (WebInspector.TextEditorMainPanel.prototype._registerShortcuts):
+        (WebInspector.TextEditorMainPanel.prototype._handleHomeKey):
+
 2013-02-07  Gavin Peters  <gavinp@chromium.org>
 

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

@@ -1398 +1398 @@
         this._shortcuts[WebInspector.KeyboardShortcut.makeKey(keys.Tab.code)] = handleTabKey;
         this._shortcuts[WebInspector.KeyboardShortcut.makeKey(keys.Tab.code, modifiers.Shift)] = handleShiftTabKey;
+
+        this._shortcuts[WebInspector.KeyboardShortcut.makeKey(keys.Home.code, modifiers.None)] = this._handleHomeKey.bind(this, false);
+        this._shortcuts[WebInspector.KeyboardShortcut.makeKey(keys.Home.code, modifiers.Shift)] = this._handleHomeKey.bind(this, true);
+    },
+
+    /**
+     * @param {boolean} shift
+     */
+    _handleHomeKey: function(shift)
+    {
+        var selection = this.selection();
+
+        var line = this._textModel.line(selection.endLine);
+        var firstNonBlankCharacter = 0;
+        while (firstNonBlankCharacter < line.length) {
+            var char = line.charAt(firstNonBlankCharacter);
+            if (char === " " || char === "\t")
+                ++firstNonBlankCharacter;
+            else
+                break;
+        }
+        if (firstNonBlankCharacter >= line.length || selection.endColumn === firstNonBlankCharacter)
+            return false;
+
+        selection.endColumn = firstNonBlankCharacter;
+        if (!shift)
+            selection = selection.collapseToEnd();
+        this._restoreSelection(selection);
+        return true;
     },