| 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 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 */ | 296 */ |
| 297 function messageAdded(event) { | 297 function messageAdded(event) { |
| 298 this._addSinkMessage(/** @type {!Common.Console.Message} */ (event.data)); | 298 this._addSinkMessage(/** @type {!Common.Console.Message} */ (event.data)); |
| 299 } | 299 } |
| 300 } | 300 } |
| 301 | 301 |
| 302 /** | 302 /** |
| 303 * @param {!Common.Console.Message} message | 303 * @param {!Common.Console.Message} message |
| 304 */ | 304 */ |
| 305 _addSinkMessage(message) { | 305 _addSinkMessage(message) { |
| 306 var level = SDK.ConsoleMessage.MessageLevel.Debug; | 306 var level = SDK.ConsoleMessage.MessageLevel.Verbose; |
| 307 switch (message.level) { | 307 switch (message.level) { |
| 308 case Common.Console.MessageLevel.Info: |
| 309 level = SDK.ConsoleMessage.MessageLevel.Info; |
| 310 break; |
| 308 case Common.Console.MessageLevel.Error: | 311 case Common.Console.MessageLevel.Error: |
| 309 level = SDK.ConsoleMessage.MessageLevel.Error; | 312 level = SDK.ConsoleMessage.MessageLevel.Error; |
| 310 break; | 313 break; |
| 311 case Common.Console.MessageLevel.Warning: | 314 case Common.Console.MessageLevel.Warning: |
| 312 level = SDK.ConsoleMessage.MessageLevel.Warning; | 315 level = SDK.ConsoleMessage.MessageLevel.Warning; |
| 313 break; | 316 break; |
| 314 } | 317 } |
| 315 | 318 |
| 316 var consoleMessage = new SDK.ConsoleMessage( | 319 var consoleMessage = new SDK.ConsoleMessage( |
| 317 null, SDK.ConsoleMessage.MessageSource.Other, level, message.text, undef
ined, undefined, undefined, undefined, | 320 null, SDK.ConsoleMessage.MessageSource.Other, level, message.text, undef
ined, undefined, undefined, undefined, |
| (...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 790 | 793 |
| 791 /** | 794 /** |
| 792 * @param {?SDK.RemoteObject} result | 795 * @param {?SDK.RemoteObject} result |
| 793 * @param {!SDK.ConsoleMessage} originatingConsoleMessage | 796 * @param {!SDK.ConsoleMessage} originatingConsoleMessage |
| 794 * @param {!Protocol.Runtime.ExceptionDetails=} exceptionDetails | 797 * @param {!Protocol.Runtime.ExceptionDetails=} exceptionDetails |
| 795 */ | 798 */ |
| 796 _printResult(result, originatingConsoleMessage, exceptionDetails) { | 799 _printResult(result, originatingConsoleMessage, exceptionDetails) { |
| 797 if (!result) | 800 if (!result) |
| 798 return; | 801 return; |
| 799 | 802 |
| 800 var level = !!exceptionDetails ? SDK.ConsoleMessage.MessageLevel.Error : SDK
.ConsoleMessage.MessageLevel.Log; | 803 var level = !!exceptionDetails ? SDK.ConsoleMessage.MessageLevel.Error : SDK
.ConsoleMessage.MessageLevel.Info; |
| 801 var message; | 804 var message; |
| 802 if (!exceptionDetails) { | 805 if (!exceptionDetails) { |
| 803 message = new SDK.ConsoleMessage( | 806 message = new SDK.ConsoleMessage( |
| 804 result.target(), SDK.ConsoleMessage.MessageSource.JS, level, '', SDK.C
onsoleMessage.MessageType.Result, | 807 result.target(), SDK.ConsoleMessage.MessageSource.JS, level, '', SDK.C
onsoleMessage.MessageType.Result, |
| 805 undefined, undefined, undefined, undefined, [result]); | 808 undefined, undefined, undefined, undefined, [result]); |
| 806 } else { | 809 } else { |
| 807 message = SDK.ConsoleMessage.fromException( | 810 message = SDK.ConsoleMessage.fromException( |
| 808 result.target(), exceptionDetails, SDK.ConsoleMessage.MessageType.Resu
lt, undefined, undefined); | 811 result.target(), exceptionDetails, SDK.ConsoleMessage.MessageType.Resu
lt, undefined, undefined); |
| 809 } | 812 } |
| 810 message.setOriginatingMessage(originatingConsoleMessage); | 813 message.setOriginatingMessage(originatingConsoleMessage); |
| (...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1063 '', Common.UIString('Hide violations'), false, Common.moduleSetting('hid
eViolationMessages')); | 1066 '', Common.UIString('Hide violations'), false, Common.moduleSetting('hid
eViolationMessages')); |
| 1064 Common.moduleSetting('hideNetworkMessages').addChangeListener(this._filterCh
anged, this); | 1067 Common.moduleSetting('hideNetworkMessages').addChangeListener(this._filterCh
anged, this); |
| 1065 Common.moduleSetting('hideViolationMessages').addChangeListener(this._filter
Changed, this); | 1068 Common.moduleSetting('hideViolationMessages').addChangeListener(this._filter
Changed, this); |
| 1066 filterBar.addFilter(this._hideNetworkMessagesCheckbox); | 1069 filterBar.addFilter(this._hideNetworkMessagesCheckbox); |
| 1067 filterBar.addFilter(this._hideViolationMessagesCheckbox); | 1070 filterBar.addFilter(this._hideViolationMessagesCheckbox); |
| 1068 | 1071 |
| 1069 var levels = [ | 1072 var levels = [ |
| 1070 {name: SDK.ConsoleMessage.MessageLevel.Error, label: Common.UIString('Erro
rs')}, | 1073 {name: SDK.ConsoleMessage.MessageLevel.Error, label: Common.UIString('Erro
rs')}, |
| 1071 {name: SDK.ConsoleMessage.MessageLevel.Warning, label: Common.UIString('Wa
rnings')}, | 1074 {name: SDK.ConsoleMessage.MessageLevel.Warning, label: Common.UIString('Wa
rnings')}, |
| 1072 {name: SDK.ConsoleMessage.MessageLevel.Info, label: Common.UIString('Info'
)}, | 1075 {name: SDK.ConsoleMessage.MessageLevel.Info, label: Common.UIString('Info'
)}, |
| 1073 {name: SDK.ConsoleMessage.MessageLevel.Log, label: Common.UIString('Logs')
}, | 1076 {name: SDK.ConsoleMessage.MessageLevel.Verbose, label: Common.UIString('Ve
rbose')} |
| 1074 {name: SDK.ConsoleMessage.MessageLevel.Debug, label: Common.UIString('Debu
g')} | |
| 1075 ]; | 1077 ]; |
| 1076 this._levelFilterUI = new UI.NamedBitSetFilterUI(levels, this._messageLevelF
iltersSetting); | 1078 this._levelFilterUI = new UI.NamedBitSetFilterUI(levels, this._messageLevelF
iltersSetting); |
| 1077 this._levelFilterUI.addEventListener(UI.FilterUI.Events.FilterChanged, this.
_filterChanged, this); | 1079 this._levelFilterUI.addEventListener(UI.FilterUI.Events.FilterChanged, this.
_filterChanged, this); |
| 1078 filterBar.addFilter(this._levelFilterUI); | 1080 filterBar.addFilter(this._levelFilterUI); |
| 1079 } | 1081 } |
| 1080 | 1082 |
| 1081 _textFilterChanged(event) { | 1083 _textFilterChanged(event) { |
| 1082 this._filterRegex = this._textFilterUI.regex(); | 1084 this._filterRegex = this._textFilterUI.regex(); |
| 1083 | 1085 |
| 1084 this._filterChanged(); | 1086 this._filterChanged(); |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1248 super(message, linkifier, nestingLevel); | 1250 super(message, linkifier, nestingLevel); |
| 1249 } | 1251 } |
| 1250 | 1252 |
| 1251 /** | 1253 /** |
| 1252 * @override | 1254 * @override |
| 1253 * @return {!Element} | 1255 * @return {!Element} |
| 1254 */ | 1256 */ |
| 1255 contentElement() { | 1257 contentElement() { |
| 1256 var element = super.contentElement(); | 1258 var element = super.contentElement(); |
| 1257 element.classList.add('console-user-command-result'); | 1259 element.classList.add('console-user-command-result'); |
| 1258 if (this.consoleMessage().level === SDK.ConsoleMessage.MessageLevel.Log) { | 1260 if (this.consoleMessage().level === SDK.ConsoleMessage.MessageLevel.Info) { |
| 1259 var icon = UI.Icon.create('smallicon-command-result', 'command-result-icon
'); | 1261 var icon = UI.Icon.create('smallicon-command-result', 'command-result-icon
'); |
| 1260 element.insertBefore(icon, element.firstChild); | 1262 element.insertBefore(icon, element.firstChild); |
| 1261 } | 1263 } |
| 1262 this.updateTimestamp(false); | 1264 this.updateTimestamp(false); |
| 1263 return element; | 1265 return element; |
| 1264 } | 1266 } |
| 1265 }; | 1267 }; |
| 1266 | 1268 |
| 1267 /** | 1269 /** |
| 1268 * @unrestricted | 1270 * @unrestricted |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1333 return true; | 1335 return true; |
| 1334 } | 1336 } |
| 1335 return false; | 1337 return false; |
| 1336 } | 1338 } |
| 1337 }; | 1339 }; |
| 1338 | 1340 |
| 1339 /** | 1341 /** |
| 1340 * @typedef {{messageIndex: number, matchIndex: number}} | 1342 * @typedef {{messageIndex: number, matchIndex: number}} |
| 1341 */ | 1343 */ |
| 1342 Console.ConsoleView.RegexMatchRange; | 1344 Console.ConsoleView.RegexMatchRange; |
| OLD | NEW |