Changeset 86932 in webkit

Timestamp:

May 20, 2011 2:32:52 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

2011-05-19 Pavel Podivilov <​podivilov@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: ctrl+s should not switch source frame to read only mode.
​https://bugs.webkit.org/show_bug.cgi?id=61125

• inspector/front-end/SourceFrame.js: (WebInspector.SourceFrame.prototype.commitEditing.didEditContent): (WebInspector.SourceFrame.prototype.commitEditing):
• inspector/front-end/inspector.js: (WebInspector.documentKeyDown):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-19  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: ctrl+s should not switch source frame to read only mode.
+        https://bugs.webkit.org/show_bug.cgi?id=61125
+
+        * inspector/front-end/SourceFrame.js:
+        (WebInspector.SourceFrame.prototype.commitEditing.didEditContent):
+        (WebInspector.SourceFrame.prototype.commitEditing):
+        * inspector/front-end/inspector.js:
+        (WebInspector.documentKeyDown):
+
 2011-05-20  Piroska András  <Piroska.Andras@stud.u-szeged.hu>
 

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

@@ -904 +904 @@
     },
 
-    commitEditing: function(callback)
+    commitEditing: function()
     {
         if (!this._viewerState) {
             // No editing was actually done.
             this._setReadOnly(true);
-            callback();
             return;
         }
@@ -916 +915 @@
         {
             this._commitEditingInProgress = false;
+            this._textViewer.readOnly = false;
+
             if (error) {
                 if (error.data && error.data[0]) {
@@ -921 +922 @@
                     WebInspector.showConsole();
                 }
-                this._textViewer.readOnly = false;
                 return;
             }
@@ -940 +940 @@
 
             delete this._viewerState;
-            this._setReadOnly(true);
+            this._delegate.setScriptSourceIsBeingEdited(false);
         }
         this._commitEditingInProgress = true;

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

@@ -691 +691 @@
     }
 
-    if (WebInspector.isEditingAnyField())
-        return;
-
     if (this.currentFocusElement && this.currentFocusElement.handleKeyEvent) {
         this.currentFocusElement.handleKeyEvent(event);
@@ -715 +712 @@
         return;
     }
+
+    if (WebInspector.isEditingAnyField())
+        return;
 
     var isMac = WebInspector.isMac();