Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Side by Side Diff: Source/WebCore/inspector/front-end/JavaScriptSourceFrame.js

Issue 11377027: Merge 133750 - Web Inspector: [Regression] Editing formatted source should not be allowed. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | Source/WebCore/inspector/front-end/UISourceCodeFrame.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 this._uiSourceCode.commitWorkingCopy(function() { }); 100 this._uiSourceCode.commitWorkingCopy(function() { });
101 delete this._isCommittingEditing; 101 delete this._isCommittingEditing;
102 }, 102 },
103 103
104 /** 104 /**
105 * @param {WebInspector.Event} event 105 * @param {WebInspector.Event} event
106 */ 106 */
107 _onFormattedChanged: function(event) 107 _onFormattedChanged: function(event)
108 { 108 {
109 var content = /** @type {string} */ event.data.content; 109 var content = /** @type {string} */ event.data.content;
110 this._textEditor.setReadOnly(this._uiSourceCode.formatted());
110 this._innerSetContent(content); 111 this._innerSetContent(content);
111 }, 112 },
112 113
113 /** 114 /**
114 * @param {WebInspector.Event} event 115 * @param {WebInspector.Event} event
115 */ 116 */
116 _onWorkingCopyChanged: function(event) 117 _onWorkingCopyChanged: function(event)
117 { 118 {
118 this._innerSetContent(this._uiSourceCode.workingCopy()); 119 this._innerSetContent(this._uiSourceCode.workingCopy());
119 }, 120 },
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 * @param {number} lineNumber 646 * @param {number} lineNumber
646 */ 647 */
647 _continueToLine: function(lineNumber) 648 _continueToLine: function(lineNumber)
648 { 649 {
649 var rawLocation = /** @type {WebInspector.DebuggerModel.Location} */ thi s._uiSourceCode.uiLocationToRawLocation(lineNumber, 0); 650 var rawLocation = /** @type {WebInspector.DebuggerModel.Location} */ thi s._uiSourceCode.uiLocationToRawLocation(lineNumber, 0);
650 WebInspector.debuggerModel.continueToLocation(rawLocation); 651 WebInspector.debuggerModel.continueToLocation(rawLocation);
651 }, 652 },
652 653
653 __proto__: WebInspector.SourceFrame.prototype 654 __proto__: WebInspector.SourceFrame.prototype
654 } 655 }
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/inspector/front-end/UISourceCodeFrame.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698