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

Side by Side Diff: Source/devtools/front_end/sources/JavaScriptSourceFrame.js

Issue 1191383002: DevTools: properly reset ignoreExecutionLine flag (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 months 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 var failedEdits = 0; 353 var failedEdits = 0;
354 354
355 /** 355 /**
356 * @this {WebInspector.JavaScriptSourceFrame} 356 * @this {WebInspector.JavaScriptSourceFrame}
357 * @param {?string} error 357 * @param {?string} error
358 * @param {!DebuggerAgent.SetScriptSourceError=} errorData 358 * @param {!DebuggerAgent.SetScriptSourceError=} errorData
359 * @param {!WebInspector.Script=} script 359 * @param {!WebInspector.Script=} script
360 */ 360 */
361 function liveEditCallback(error, errorData, script) 361 function liveEditCallback(error, errorData, script)
362 { 362 {
363 this._scriptsPanel.setIgnoreExecutionLineEvents(false);
363 if (error) { 364 if (error) {
364 liveEditError = error; 365 liveEditError = error;
365 liveEditErrorData = errorData; 366 liveEditErrorData = errorData;
366 contextScript = script; 367 contextScript = script;
367 failedEdits++; 368 ++failedEdits;
368 } else 369 } else {
369 succeededEdits++; 370 ++succeededEdits;
371 }
370 372
371 if (succeededEdits + failedEdits !== scriptFiles.length) 373 if (succeededEdits + failedEdits !== scriptFiles.length)
372 return; 374 return;
373 375
374 if (failedEdits) 376 if (failedEdits)
375 logLiveEditError.call(this, liveEditError, liveEditErrorData, co ntextScript); 377 logLiveEditError.call(this, liveEditError, liveEditErrorData, co ntextScript);
376 this._scriptsPanel.setIgnoreExecutionLineEvents(false);
377 } 378 }
378 379
379 /** 380 /**
380 * @param {?string} error 381 * @param {?string} error
381 * @param {!DebuggerAgent.SetScriptSourceError=} errorData 382 * @param {!DebuggerAgent.SetScriptSourceError=} errorData
382 * @param {!WebInspector.Script=} contextScript 383 * @param {!WebInspector.Script=} contextScript
383 * @this {WebInspector.JavaScriptSourceFrame} 384 * @this {WebInspector.JavaScriptSourceFrame}
384 */ 385 */
385 function logLiveEditError(error, errorData, contextScript) 386 function logLiveEditError(error, errorData, contextScript)
386 { 387 {
(...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after
1123 this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events. WorkingCopyChanged, this._workingCopyChanged, this); 1124 this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events. WorkingCopyChanged, this._workingCopyChanged, this);
1124 this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events. WorkingCopyCommitted, this._workingCopyCommitted, this); 1125 this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events. WorkingCopyCommitted, this._workingCopyCommitted, this);
1125 this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events. TitleChanged, this._showBlackboxInfobarIfNeeded, this); 1126 this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events. TitleChanged, this._showBlackboxInfobarIfNeeded, this);
1126 WebInspector.moduleSetting("skipStackFramesPattern").removeChangeListene r(this._showBlackboxInfobarIfNeeded, this); 1127 WebInspector.moduleSetting("skipStackFramesPattern").removeChangeListene r(this._showBlackboxInfobarIfNeeded, this);
1127 WebInspector.moduleSetting("skipContentScripts").removeChangeListener(th is._showBlackboxInfobarIfNeeded, this); 1128 WebInspector.moduleSetting("skipContentScripts").removeChangeListener(th is._showBlackboxInfobarIfNeeded, this);
1128 WebInspector.UISourceCodeFrame.prototype.dispose.call(this); 1129 WebInspector.UISourceCodeFrame.prototype.dispose.call(this);
1129 }, 1130 },
1130 1131
1131 __proto__: WebInspector.UISourceCodeFrame.prototype 1132 __proto__: WebInspector.UISourceCodeFrame.prototype
1132 } 1133 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698