Title: [86932] trunk/Source/WebCore
- Revision
- 86932
- Author
- podivi...@chromium.org
- Date
- 2011-05-20 02:32:52 -0700 (Fri, 20 May 2011)
Log Message
2011-05-19 Pavel Podivilov <podivi...@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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (86931 => 86932)
--- trunk/Source/WebCore/ChangeLog 2011-05-20 08:53:05 UTC (rev 86931)
+++ trunk/Source/WebCore/ChangeLog 2011-05-20 09:32:52 UTC (rev 86932)
@@ -1,3 +1,16 @@
+2011-05-19 Pavel Podivilov <podivi...@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.and...@stud.u-szeged.hu>
Reviewed by Nikolas Zimmermann.
Modified: trunk/Source/WebCore/inspector/front-end/SourceFrame.js (86931 => 86932)
--- trunk/Source/WebCore/inspector/front-end/SourceFrame.js 2011-05-20 08:53:05 UTC (rev 86931)
+++ trunk/Source/WebCore/inspector/front-end/SourceFrame.js 2011-05-20 09:32:52 UTC (rev 86932)
@@ -903,24 +903,24 @@
this._setReadOnly(false);
},
- commitEditing: function(callback)
+ commitEditing: function()
{
if (!this._viewerState) {
// No editing was actually done.
this._setReadOnly(true);
- callback();
return;
}
function didEditContent(error)
{
this._commitEditingInProgress = false;
+ this._textViewer.readOnly = false;
+
if (error) {
if (error.data && error.data[0]) {
WebInspector.log(error.data[0], WebInspector.ConsoleMessage.MessageLevel.Error);
WebInspector.showConsole();
}
- this._textViewer.readOnly = false;
return;
}
@@ -939,7 +939,7 @@
}
delete this._viewerState;
- this._setReadOnly(true);
+ this._delegate.setScriptSourceIsBeingEdited(false);
}
this._commitEditingInProgress = true;
this._textViewer.readOnly = true;
Modified: trunk/Source/WebCore/inspector/front-end/inspector.js (86931 => 86932)
--- trunk/Source/WebCore/inspector/front-end/inspector.js 2011-05-20 08:53:05 UTC (rev 86931)
+++ trunk/Source/WebCore/inspector/front-end/inspector.js 2011-05-20 09:32:52 UTC (rev 86932)
@@ -690,9 +690,6 @@
return;
}
- if (WebInspector.isEditingAnyField())
- return;
-
if (this.currentFocusElement && this.currentFocusElement.handleKeyEvent) {
this.currentFocusElement.handleKeyEvent(event);
if (event.handled) {
@@ -715,6 +712,9 @@
return;
}
+ if (WebInspector.isEditingAnyField())
+ return;
+
var isMac = WebInspector.isMac();
switch (event.keyIdentifier) {
case "Left":
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
