| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2009 Joseph Pecoraro | 3 * Copyright (C) 2009 Joseph Pecoraro |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 789 _printResult: function(result, wasThrown, originatingConsoleMessage, excepti
onDetails) | 789 _printResult: function(result, wasThrown, originatingConsoleMessage, excepti
onDetails) |
| 790 { | 790 { |
| 791 if (!result) | 791 if (!result) |
| 792 return; | 792 return; |
| 793 | 793 |
| 794 var level = wasThrown ? WebInspector.ConsoleMessage.MessageLevel.Error :
WebInspector.ConsoleMessage.MessageLevel.Log; | 794 var level = wasThrown ? WebInspector.ConsoleMessage.MessageLevel.Error :
WebInspector.ConsoleMessage.MessageLevel.Log; |
| 795 var message; | 795 var message; |
| 796 if (!wasThrown) | 796 if (!wasThrown) |
| 797 message = new WebInspector.ConsoleMessage(result.target(), WebInspec
tor.ConsoleMessage.MessageSource.JS, level, "", WebInspector.ConsoleMessage.Mess
ageType.Result, undefined, undefined, undefined, undefined, [result]); | 797 message = new WebInspector.ConsoleMessage(result.target(), WebInspec
tor.ConsoleMessage.MessageSource.JS, level, "", WebInspector.ConsoleMessage.Mess
ageType.Result, undefined, undefined, undefined, undefined, [result]); |
| 798 else | 798 else |
| 799 message = new WebInspector.ConsoleMessage(result.target(), WebInspec
tor.ConsoleMessage.MessageSource.JS, level, exceptionDetails.text, WebInspector.
ConsoleMessage.MessageType.Result, undefined, exceptionDetails.lineNumber + 1, e
xceptionDetails.columnNumber + 1, undefined, [WebInspector.UIString("Uncaught"),
result], exceptionDetails.stackTrace, undefined, undefined, exceptionDetails.sc
riptId); | 799 message = new WebInspector.ConsoleMessage(result.target(), WebInspec
tor.ConsoleMessage.MessageSource.JS, level, exceptionDetails.text, WebInspector.
ConsoleMessage.MessageType.Result, undefined, exceptionDetails.lineNumber, excep
tionDetails.columnNumber, undefined, [WebInspector.UIString("Uncaught"), result]
, exceptionDetails.stackTrace, undefined, undefined, exceptionDetails.scriptId); |
| 800 message.setOriginatingMessage(originatingConsoleMessage); | 800 message.setOriginatingMessage(originatingConsoleMessage); |
| 801 result.target().consoleModel.addMessage(message); | 801 result.target().consoleModel.addMessage(message); |
| 802 }, | 802 }, |
| 803 | 803 |
| 804 /** | 804 /** |
| 805 * @param {string} text | 805 * @param {string} text |
| 806 * @param {boolean} useCommandLineAPI | 806 * @param {boolean} useCommandLineAPI |
| 807 */ | 807 */ |
| 808 _appendCommand: function(text, useCommandLineAPI) | 808 _appendCommand: function(text, useCommandLineAPI) |
| 809 { | 809 { |
| (...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1338 return true; | 1338 return true; |
| 1339 } | 1339 } |
| 1340 return false; | 1340 return false; |
| 1341 } | 1341 } |
| 1342 } | 1342 } |
| 1343 | 1343 |
| 1344 /** | 1344 /** |
| 1345 * @typedef {{messageIndex: number, matchIndex: number}} | 1345 * @typedef {{messageIndex: number, matchIndex: number}} |
| 1346 */ | 1346 */ |
| 1347 WebInspector.ConsoleView.RegexMatchRange; | 1347 WebInspector.ConsoleView.RegexMatchRange; |
| OLD | NEW |