Title: [133762] branches/chromium/1312/Source/WebCore/inspector/front-end
- Revision
- 133762
- Author
- [email protected]
- Date
- 2012-11-07 08:05:27 -0800 (Wed, 07 Nov 2012)
Log Message
Merge 133750 - Web Inspector: [Regression] Editing formatted source should not be allowed.
https://bugs.webkit.org/show_bug.cgi?id=101355
Reviewed by Pavel Feldman.
* inspector/front-end/_javascript_SourceFrame.js:
(WebInspector._javascript_SourceFrame.prototype._onFormattedChanged):
* inspector/front-end/UISourceCodeFrame.js:
(WebInspector.UISourceCodeFrame.prototype._onFormattedChanged):
[email protected]
BUG=159820
Review URL: https://codereview.chromium.org/11377027
Modified Paths
Diff
Modified: branches/chromium/1312/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js (133761 => 133762)
--- branches/chromium/1312/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js 2012-11-07 16:04:03 UTC (rev 133761)
+++ branches/chromium/1312/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js 2012-11-07 16:05:27 UTC (rev 133762)
@@ -107,6 +107,7 @@
_onFormattedChanged: function(event)
{
var content = /** @type {string} */ event.data.content;
+ this._textEditor.setReadOnly(this._uiSourceCode.formatted());
this._innerSetContent(content);
},
Modified: branches/chromium/1312/Source/WebCore/inspector/front-end/UISourceCodeFrame.js (133761 => 133762)
--- branches/chromium/1312/Source/WebCore/inspector/front-end/UISourceCodeFrame.js 2012-11-07 16:04:03 UTC (rev 133761)
+++ branches/chromium/1312/Source/WebCore/inspector/front-end/UISourceCodeFrame.js 2012-11-07 16:05:27 UTC (rev 133762)
@@ -83,6 +83,7 @@
_onFormattedChanged: function(event)
{
var content = /** @type {string} */ event.data.content;
+ this._textEditor.setReadOnly(this._uiSourceCode.formatted());
this._innerSetContent(content);
},
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
