Changeset 80728 in webkit

Timestamp:

Mar 10, 2011 8:46:02 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

2011-03-10 Andrey Adaikin <​aandrey@google.com>

Reviewed by Pavel Feldman.

Web Inspector: [Text editor] Substitute live-edit mode activation by double-click
​https://bugs.webkit.org/show_bug.cgi?id=56084

Also fixed a regression: console was not opening/closing on ESC key press because tabIndex="0" attribute was preserved for a readOnly viewer.

• inspector/front-end/SourceFrame.js: (WebInspector.SourceFrame): (WebInspector.SourceFrame.prototype._startEditing): (WebInspector.SourceFrame.prototype._registerShortcuts): (WebInspector.SourceFrame.prototype._handleKeyDown): (WebInspector.SourceFrame.prototype._handleSave): (WebInspector.SourceFrame.prototype._handleRevertEditing): (WebInspector.SourceFrame.prototype._doubleClick):
• inspector/front-end/TextEditorModel.js: (WebInspector.TextEditorModel.prototype.get text):
• inspector/front-end/TextViewer.js: (WebInspector.TextViewer.prototype.get readOnly): (WebInspector.TextEditorMainPanel): (WebInspector.TextEditorMainPanel.prototype.set readOnly): (WebInspector.TextEditorMainPanel.prototype.get readOnly):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/SourceFrame.js (modified) (4 diffs)
• inspector/front-end/TextEditorModel.js (modified) (1 diff)
• inspector/front-end/TextViewer.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-10  Andrey Adaikin  <aandrey@google.com>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: [Text editor] Substitute live-edit mode activation by double-click
+        https://bugs.webkit.org/show_bug.cgi?id=56084
+
+        Also fixed a regression: console was not opening/closing on ESC key press because tabIndex="0" attribute was preserved for a readOnly viewer.
+
+        * inspector/front-end/SourceFrame.js:
+        (WebInspector.SourceFrame):
+        (WebInspector.SourceFrame.prototype._startEditing):
+        (WebInspector.SourceFrame.prototype._registerShortcuts):
+        (WebInspector.SourceFrame.prototype._handleKeyDown):
+        (WebInspector.SourceFrame.prototype._handleSave):
+        (WebInspector.SourceFrame.prototype._handleRevertEditing):
+        (WebInspector.SourceFrame.prototype._doubleClick):
+        * inspector/front-end/TextEditorModel.js:
+        (WebInspector.TextEditorModel.prototype.get text):
+        * inspector/front-end/TextViewer.js:
+        (WebInspector.TextViewer.prototype.get readOnly):
+        (WebInspector.TextEditorMainPanel):
+        (WebInspector.TextEditorMainPanel.prototype.set readOnly):
+        (WebInspector.TextEditorMainPanel.prototype.get readOnly):
+
 2011-03-10  Greg Simon  <gregsimon@chromium.org>
 

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

@@ -47 +47 @@
     this._rowMessages = {};
     this._messageBubbles = {};
+
+    if (Preferences.sourceEditorEnabled) {
+        this._registerShortcuts();
+        this.element.addEventListener("keydown", this._handleKeyDown.bind(this), false);
+    }
 }
 
@@ -174 +179 @@
     _startEditing: function()
     {
+        if (this._originalTextModelContent === undefined)
+            this._originalTextModelContent = this._textModel.text;
+
         WebInspector.searchController.cancelSearch();
         this.clearMessages();
@@ -764 +772 @@
     },
 
+    _registerShortcuts: function()
+    {
+        this._shortcuts = {};
+        this._shortcuts[WebInspector.KeyboardShortcut.makeKey("s", WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta)] = this._handleSave.bind(this);
+        this._shortcuts[WebInspector.KeyboardShortcut.makeKey(WebInspector.KeyboardShortcut.Keys.Esc.code)] = this._handleRevertEditing.bind(this);
+    },
+
+    _handleKeyDown: function(e)
+    {
+        var shortcutKey = WebInspector.KeyboardShortcut.makeKeyFromEvent(e);
+        var handler = this._shortcuts[shortcutKey];
+        if (handler) {
+            handler.call(this);
+            e.preventDefault();
+            e.stopPropagation();
+        }
+    },
+
+    _handleSave: function()
+    {
+        if (!this._delegate.canEditScriptSource())
+            return;
+
+        var newSource = this._textModel.text;
+        if (this._originalTextModelContent !== newSource)
+            this._delegate.editScriptSource(newSource);
+        delete this._originalTextModelContent;
+        this._textViewer.readOnly = true;
+    },
+
+    _handleRevertEditing: function()
+    {
+        if (this._originalTextModelContent !== undefined)
+            this._textModel.setText(null, this._originalTextModelContent);
+        delete this._originalTextModelContent;
+        this._textViewer.readOnly = true;
+    },
+
     _doubleClick: function(event)
     {
@@ -772 +818 @@
         if (!lineRow)
             return;  // Do not trigger editing from line numbers.
+
+        if (Preferences.sourceEditorEnabled) {
+            if (this._textViewer.readOnly) {
+                this._textViewer.readOnly = false;
+                window.getSelection().collapseToStart();
+            }
+            return;
+        }
 
         this._textViewer.editLine(lineRow, this._didEditLine.bind(this, lineRow.lineNumber));

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

@@ -73 +73 @@
     },
 
+    get text()
+    {
+        return this._lines.join("\n");
+    },
+
     line: function(lineNumber)
     {

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

@@ -59 +59 @@
     },
 
+    get readOnly()
+    {
+        return this._mainPanel.readOnly;
+    },
+
     set startEditingListener(startEditingListener)
     {
@@ -681 +686 @@
     this.element = document.createElement("div");
     this.element.className = "text-editor-contents";
-    this.element.tabIndex = 0;
 
     this._container = document.createElement("div");
     this._container.className = "inner-container";
-    this._container.tabIndex = 0;
     this.element.appendChild(this._container);
 
@@ -721 +724 @@
         this.beginDomUpdates();
         this._readOnly = readOnly;
-        if (this._readOnly)
+        if (this._readOnly) {
+            this.element.removeAttribute("tabIndex");
+            this._container.removeAttribute("tabIndex");
             this._container.removeStyleClass("text-editor-editable");
-        else
+            // Remove the focus from the editable area.
+            this._container.blur();
+            this.element.blur();
+        } else {
+            this.element.setAttribute("tabIndex", "0");
+            this._container.setAttribute("tabIndex", "0");
             this._container.addStyleClass("text-editor-editable");
+        }
         this.endDomUpdates();
+    },
+
+    get readOnly()
+    {
+        return this._readOnly;
     },