OLD | NEW |
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 376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
387 { | 387 { |
388 var warningLevel = WebInspector.Console.MessageLevel.Warning; | 388 var warningLevel = WebInspector.Console.MessageLevel.Warning; |
389 if (!errorData) { | 389 if (!errorData) { |
390 if (error) | 390 if (error) |
391 WebInspector.console.addMessage(WebInspector.UIString("LiveE
dit failed: %s", error), warningLevel); | 391 WebInspector.console.addMessage(WebInspector.UIString("LiveE
dit failed: %s", error), warningLevel); |
392 return; | 392 return; |
393 } | 393 } |
394 var compileError = errorData.compileError; | 394 var compileError = errorData.compileError; |
395 if (compileError) { | 395 if (compileError) { |
396 var messageText = WebInspector.UIString("LiveEdit compile failed
: %s", compileError.message); | 396 var messageText = WebInspector.UIString("LiveEdit compile failed
: %s", compileError.message); |
397 var message = new WebInspector.SourceFrameMessage(messageText, W
ebInspector.SourceFrameMessage.Level.Error, compileError.lineNumber - 1, compile
Error.columnNumber + 1); | 397 var location = {line: compileError.lineNumber - 1, column: compi
leError.columnNumber + 1}; |
| 398 var message = new WebInspector.SourceFrameMessage(messageText, W
ebInspector.SourceFrameMessage.Level.Error, location, location); |
398 this.addMessageToSource(message); | 399 this.addMessageToSource(message); |
399 } else { | 400 } else { |
400 WebInspector.console.addMessage(WebInspector.UIString("Unknown L
iveEdit error: %s; %s", JSON.stringify(errorData), error), warningLevel); | 401 WebInspector.console.addMessage(WebInspector.UIString("Unknown L
iveEdit error: %s; %s", JSON.stringify(errorData), error), warningLevel); |
401 } | 402 } |
402 } | 403 } |
403 | 404 |
404 this._scriptsPanel.setIgnoreExecutionLineEvents(true); | 405 this._scriptsPanel.setIgnoreExecutionLineEvents(true); |
405 this._hasCommittedLiveEdit = true; | 406 this._hasCommittedLiveEdit = true; |
406 var scriptFiles = this._scriptFileForTarget.valuesArray(); | 407 var scriptFiles = this._scriptFileForTarget.valuesArray(); |
407 for (var i = 0; i < scriptFiles.length; ++i) | 408 for (var i = 0; i < scriptFiles.length; ++i) |
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1126 this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.
WorkingCopyChanged, this._workingCopyChanged, this); | 1127 this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.
WorkingCopyChanged, this._workingCopyChanged, this); |
1127 this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.
WorkingCopyCommitted, this._workingCopyCommitted, this); | 1128 this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.
WorkingCopyCommitted, this._workingCopyCommitted, this); |
1128 this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.
TitleChanged, this._showBlackboxInfobarIfNeeded, this); | 1129 this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.
TitleChanged, this._showBlackboxInfobarIfNeeded, this); |
1129 WebInspector.moduleSetting("skipStackFramesPattern").removeChangeListene
r(this._showBlackboxInfobarIfNeeded, this); | 1130 WebInspector.moduleSetting("skipStackFramesPattern").removeChangeListene
r(this._showBlackboxInfobarIfNeeded, this); |
1130 WebInspector.moduleSetting("skipContentScripts").removeChangeListener(th
is._showBlackboxInfobarIfNeeded, this); | 1131 WebInspector.moduleSetting("skipContentScripts").removeChangeListener(th
is._showBlackboxInfobarIfNeeded, this); |
1131 WebInspector.UISourceCodeFrame.prototype.dispose.call(this); | 1132 WebInspector.UISourceCodeFrame.prototype.dispose.call(this); |
1132 }, | 1133 }, |
1133 | 1134 |
1134 __proto__: WebInspector.UISourceCodeFrame.prototype | 1135 __proto__: WebInspector.UISourceCodeFrame.prototype |
1135 } | 1136 } |
OLD | NEW |