| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 3 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. |
| 4 * Copyright (C) 2009 Joseph Pecoraro | 4 * Copyright (C) 2009 Joseph Pecoraro |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * | 9 * |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 } | 184 } |
| 185 return formattedMessage; | 185 return formattedMessage; |
| 186 } | 186 } |
| 187 | 187 |
| 188 /** | 188 /** |
| 189 * @param {!WebInspector.ConsoleMessage} consoleMessage | 189 * @param {!WebInspector.ConsoleMessage} consoleMessage |
| 190 * @return {!Element} | 190 * @return {!Element} |
| 191 */ | 191 */ |
| 192 _buildMessage(consoleMessage) { | 192 _buildMessage(consoleMessage) { |
| 193 var messageElement; | 193 var messageElement; |
| 194 var messageText = consoleMessage.messageText; |
| 194 if (consoleMessage.source === WebInspector.ConsoleMessage.MessageSource.Cons
oleAPI) { | 195 if (consoleMessage.source === WebInspector.ConsoleMessage.MessageSource.Cons
oleAPI) { |
| 195 switch (consoleMessage.type) { | 196 switch (consoleMessage.type) { |
| 196 case WebInspector.ConsoleMessage.MessageType.Trace: | 197 case WebInspector.ConsoleMessage.MessageType.Trace: |
| 197 messageElement = this._format(consoleMessage.parameters || ['console.t
race']); | 198 messageElement = this._format(consoleMessage.parameters || ['console.t
race']); |
| 198 break; | 199 break; |
| 199 case WebInspector.ConsoleMessage.MessageType.Clear: | 200 case WebInspector.ConsoleMessage.MessageType.Clear: |
| 200 messageElement = createElementWithClass('span', 'console-info'); | 201 messageElement = createElementWithClass('span', 'console-info'); |
| 201 messageElement.textContent = WebInspector.UIString('Console was cleare
d'); | 202 messageElement.textContent = WebInspector.UIString('Console was cleare
d'); |
| 202 break; | 203 break; |
| 203 case WebInspector.ConsoleMessage.MessageType.Assert: | 204 case WebInspector.ConsoleMessage.MessageType.Assert: |
| 204 var args = [WebInspector.UIString('Assertion failed:')]; | 205 var args = [WebInspector.UIString('Assertion failed:')]; |
| 205 if (consoleMessage.parameters) | 206 if (consoleMessage.parameters) |
| 206 args = args.concat(consoleMessage.parameters); | 207 args = args.concat(consoleMessage.parameters); |
| 207 messageElement = this._format(args); | 208 messageElement = this._format(args); |
| 208 break; | 209 break; |
| 209 case WebInspector.ConsoleMessage.MessageType.Dir: | 210 case WebInspector.ConsoleMessage.MessageType.Dir: |
| 210 var obj = consoleMessage.parameters ? consoleMessage.parameters[0] : u
ndefined; | 211 var obj = consoleMessage.parameters ? consoleMessage.parameters[0] : u
ndefined; |
| 211 var args = ['%O', obj]; | 212 var args = ['%O', obj]; |
| 212 messageElement = this._format(args); | 213 messageElement = this._format(args); |
| 213 break; | 214 break; |
| 214 case WebInspector.ConsoleMessage.MessageType.Profile: | 215 case WebInspector.ConsoleMessage.MessageType.Profile: |
| 215 case WebInspector.ConsoleMessage.MessageType.ProfileEnd: | 216 case WebInspector.ConsoleMessage.MessageType.ProfileEnd: |
| 216 messageElement = this._format([consoleMessage.messageText]); | 217 messageElement = this._format([messageText]); |
| 217 break; | 218 break; |
| 218 default: | 219 default: |
| 219 if (consoleMessage.parameters && consoleMessage.parameters.length ===
1 && | 220 if (consoleMessage.parameters && consoleMessage.parameters.length ===
1 && |
| 220 consoleMessage.parameters[0].type === 'string') | 221 consoleMessage.parameters[0].type === 'string') |
| 221 messageElement = this._tryFormatAsError(/** @type {string} */ (conso
leMessage.parameters[0].value)); | 222 messageElement = this._tryFormatAsError(/** @type {string} */ (conso
leMessage.parameters[0].value)); |
| 222 var args = consoleMessage.parameters || [consoleMessage.messageText]; | 223 var args = consoleMessage.parameters || [messageText]; |
| 223 messageElement = messageElement || this._format(args); | 224 messageElement = messageElement || this._format(args); |
| 224 } | 225 } |
| 225 } else if (consoleMessage.source === WebInspector.ConsoleMessage.MessageSour
ce.Network) { | 226 } else if (consoleMessage.source === WebInspector.ConsoleMessage.MessageSour
ce.Network) { |
| 226 if (consoleMessage.request) { | 227 if (consoleMessage.request) { |
| 227 messageElement = createElement('span'); | 228 messageElement = createElement('span'); |
| 228 if (consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.Er
ror || | 229 if (consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.Er
ror || |
| 229 consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.Re
vokedError) { | 230 consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.Re
vokedError) { |
| 230 messageElement.createTextChild(consoleMessage.request.requestMethod +
' '); | 231 messageElement.createTextChild(consoleMessage.request.requestMethod +
' '); |
| 231 messageElement.appendChild(WebInspector.Linkifier.linkifyUsingRevealer
( | 232 messageElement.appendChild(WebInspector.Linkifier.linkifyUsingRevealer
( |
| 232 consoleMessage.request, consoleMessage.request.url, consoleMessage
.request.url)); | 233 consoleMessage.request, consoleMessage.request.url, consoleMessage
.request.url)); |
| 233 if (consoleMessage.request.failed) | 234 if (consoleMessage.request.failed) |
| 234 messageElement.createTextChildren(' ', consoleMessage.request.locali
zedFailDescription); | 235 messageElement.createTextChildren(' ', consoleMessage.request.locali
zedFailDescription); |
| 235 else | 236 else |
| 236 messageElement.createTextChildren( | 237 messageElement.createTextChildren( |
| 237 ' ', String(consoleMessage.request.statusCode), ' (', consoleMes
sage.request.statusText, ')'); | 238 ' ', String(consoleMessage.request.statusCode), ' (', consoleMes
sage.request.statusText, ')'); |
| 238 } else { | 239 } else { |
| 239 var fragment = WebInspector.linkifyStringAsFragmentWithCustomLinkifier
( | 240 var fragment = WebInspector.linkifyStringAsFragmentWithCustomLinkifier
( |
| 240 consoleMessage.messageText, linkifyRequest.bind(consoleMessage)); | 241 messageText, linkifyRequest.bind(consoleMessage)); |
| 241 messageElement.appendChild(fragment); | 242 messageElement.appendChild(fragment); |
| 242 } | 243 } |
| 243 } else { | 244 } else { |
| 244 messageElement = this._format([consoleMessage.messageText]); | 245 messageElement = this._format([messageText]); |
| 245 } | 246 } |
| 246 } else { | 247 } else { |
| 247 var args = consoleMessage.parameters || [consoleMessage.messageText]; | 248 if (consoleMessage.source === WebInspector.ConsoleMessage.MessageSource.Vi
olation) |
| 249 messageText = WebInspector.UIString('[Violation] %s', messageText); |
| 250 var args = consoleMessage.parameters || [messageText]; |
| 248 messageElement = this._format(args); | 251 messageElement = this._format(args); |
| 249 } | 252 } |
| 250 messageElement.classList.add('console-message-text'); | 253 messageElement.classList.add('console-message-text'); |
| 251 | 254 |
| 252 var formattedMessage = createElement('span'); | 255 var formattedMessage = createElement('span'); |
| 253 WebInspector.appendStyle(formattedMessage, 'components/objectValue.css'); | 256 WebInspector.appendStyle(formattedMessage, 'components/objectValue.css'); |
| 254 formattedMessage.className = 'source-code'; | 257 formattedMessage.className = 'source-code'; |
| 255 | 258 |
| 256 var anchorElement = this._buildMessageAnchor(consoleMessage); | 259 var anchorElement = this._buildMessageAnchor(consoleMessage); |
| 257 if (anchorElement) | 260 if (anchorElement) |
| (...skipping 972 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1230 * @return {!Element} | 1233 * @return {!Element} |
| 1231 */ | 1234 */ |
| 1232 toMessageElement() { | 1235 toMessageElement() { |
| 1233 if (!this._element) { | 1236 if (!this._element) { |
| 1234 super.toMessageElement(); | 1237 super.toMessageElement(); |
| 1235 this._element.classList.toggle('collapsed', this._collapsed); | 1238 this._element.classList.toggle('collapsed', this._collapsed); |
| 1236 } | 1239 } |
| 1237 return this._element; | 1240 return this._element; |
| 1238 } | 1241 } |
| 1239 }; | 1242 }; |
| OLD | NEW |