Changeset 84136 in webkit

Timestamp:

Apr 18, 2011 6:36:07 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-18 Andrey Adaikin <​aandrey@google.com>

Reviewed by Yury Semikhatsky.

Web Inspector: TAB should not move focus from the text editor while live editing
​https://bugs.webkit.org/show_bug.cgi?id=58537

• inspector/front-end/TextViewer.js: (WebInspector.TextViewer.prototype._registerShortcuts): (WebInspector.TextViewer.prototype._cancelEditing): (WebInspector.TextEditorMainPanel.prototype.handleUndoRedo): (WebInspector.TextEditorMainPanel.prototype.handleTabKeyPress): (WebInspector.TextEditorMainPanel.prototype._setCaretLocation): (WebInspector.TextEditorMainPanel.prototype._applyDomUpdates): (WebInspector.TextEditorMainPanel.prototype._setText):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/TextViewer.js (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-18  Andrey Adaikin  <aandrey@google.com>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: TAB should not move focus from the text editor while live editing
+        https://bugs.webkit.org/show_bug.cgi?id=58537
+
+        * inspector/front-end/TextViewer.js:
+        (WebInspector.TextViewer.prototype._registerShortcuts):
+        (WebInspector.TextViewer.prototype._cancelEditing):
+        (WebInspector.TextEditorMainPanel.prototype.handleUndoRedo):
+        (WebInspector.TextEditorMainPanel.prototype.handleTabKeyPress):
+        (WebInspector.TextEditorMainPanel.prototype._setCaretLocation):
+        (WebInspector.TextEditorMainPanel.prototype._applyDomUpdates):
+        (WebInspector.TextEditorMainPanel.prototype._setText):
+
 2011-04-18  Alexander Pavlov  <apavlov@chromium.org>
 

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

@@ -254 +254 @@
         this._shortcuts[WebInspector.KeyboardShortcut.makeKey(keys.Esc.code)] = cancelEditing;
 
-        var handleUndo = this._handleUndoRedo.bind(this, 0);
-        var handleRedo = this._handleUndoRedo.bind(this, 1);
+        var handleUndo = this._mainPanel.handleUndoRedo.bind(this._mainPanel, false);
+        var handleRedo = this._mainPanel.handleUndoRedo.bind(this._mainPanel, true);
         this._shortcuts[WebInspector.KeyboardShortcut.makeKey("z", modifiers.CtrlOrMeta)] = handleUndo;
         this._shortcuts[WebInspector.KeyboardShortcut.makeKey("z", modifiers.Shift | modifiers.CtrlOrMeta)] = handleRedo;
+
+        var handleTabKey = this._mainPanel.handleTabKeyPress.bind(this._mainPanel, false);
+        var handleShiftTabKey = this._mainPanel.handleTabKeyPress.bind(this._mainPanel, true);
+        this._shortcuts[WebInspector.KeyboardShortcut.makeKey(keys.Tab.code)] = handleTabKey;
+        this._shortcuts[WebInspector.KeyboardShortcut.makeKey(keys.Tab.code, modifiers.Shift)] = handleShiftTabKey;
     },
 
@@ -295 +300 @@
         this._delegate.cancelEditing();
         return true;
-    },
-
-    _handleUndoRedo: function(redo)
-    {
-        return this._mainPanel.handleUndoRedo(redo);
     }
 }
@@ -938 +938 @@
         var range = redo ? this._textModel.redo(callback) : this._textModel.undo(callback);
         if (range)
-            this._restoreSelection(new WebInspector.TextRange(range.endLine, range.endColumn, range.endLine, range.endColumn), true);
+            this._setCaretLocation(range.endLine, range.endColumn, true);
 
         this._exitTextChangeMode(null, null);
         this.endUpdates();
 
+        return true;
+    },
+
+    handleTabKeyPress: function(shiftKey)
+    {
+        if (this._readOnly || this._dirtyLines)
+            return false;
+
+        var selection = this._getSelection();
+        if (!selection)
+            return false;
+
+        if (shiftKey)
+            return true;
+
+        this.beginUpdates();
+        this._enterTextChangeMode();
+
+        var range = selection;
+        if (range.startLine > range.endLine || (range.startLine === range.endLine && range.startColumn > range.endColumn))
+            range = new WebInspector.TextRange(range.endLine, range.endColumn, range.startLine, range.startColumn);
+
+        var newRange = this._setText(range, "\t");
+
+        this._exitTextChangeMode(range, newRange);
+        this.endUpdates();
+
+        this._setCaretLocation(newRange.endLine, newRange.endColumn, true);
         return true;
     },
@@ -1228 +1256 @@
     },
 
+    _setCaretLocation: function(line, column, scrollIntoView)
+    {
+        var range = new WebInspector.TextRange(line, column, line, column);
+        this._restoreSelection(range, scrollIntoView);
+    },
+
     _selectionToPosition: function(container, offset)
     {
@@ -1507 +1541 @@
             var oldRange = new WebInspector.TextRange(startLine, startColumn, endLine - 1, endColumn);
 
-        if (this._lastEditedRange && (lines.length !== 1 || this._lastEditedRange.endLine !== oldRange.startLine || this._lastEditedRange.endColumn !== oldRange.startColumn))
-            this._textModel.markUndoableState();
-
-        var newRange = this._textModel.setText(oldRange, lines.join("\n"));
-        this._lastEditedRange = newRange;
-
+        var newRange = this._setText(oldRange, lines.join("\n"));
+        
         this._paintScheduledLines(true);
         this._restoreSelection(selection);
@@ -1526 +1556 @@
         this._updateHighlightsForRange(newRange);
         this.endDomUpdates();
+    },
+
+    _setText: function(range, text)
+    {
+        if (this._lastEditedRange && (!text || text.indexOf("\n") !== -1 || this._lastEditedRange.endLine !== range.startLine || this._lastEditedRange.endColumn !== range.startColumn))
+            this._textModel.markUndoableState();
+
+        var newRange = this._textModel.setText(range, text);
+        this._lastEditedRange = newRange;
+
+        return newRange;
     },