Changeset 190571 in webkit
- Timestamp:
- Oct 5, 2015 1:00:24 PM (8 years ago)
- Location:
- trunk/Source/WebInspectorUI
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebInspectorUI/ChangeLog
r190564 r190571 1 2015-10-05 Nikita Vasilyev <nvasilyev@apple.com> 2 3 Web Inspector: Error displayed as an object when passed as a second argument to console.log 4 https://bugs.webkit.org/show_bug.cgi?id=149799 5 6 Reviewed by Joseph Pecoraro. 7 8 * UserInterface/Views/ConsoleMessageView.js: 9 (WebInspector.ConsoleMessageView.prototype._appendExtraParameters): 10 Don't format errors as objects. 11 12 (WebInspector.ConsoleMessageView.prototype._formatParameter): 13 (WebInspector.ConsoleMessageView.prototype._formatParameterAsValue): 14 (WebInspector.ConsoleMessageView.prototype._formatParameterAsString): 15 (WebInspector.ConsoleMessageView.prototype._formatParameterAsNode): 16 (WebInspector.ConsoleMessageView.prototype._formatParameterAsObject): 17 (WebInspector.ConsoleMessageView.prototype._formatParameterAsError): 18 (WebInspector.ConsoleMessageView.prototype._formatParameterAsArray): 19 Replace an unnecessary span element with a document fragment. 20 21 * UserInterface/Views/ErrorObjectView.css: 22 (.error-object): 23 Display an error object on the same line as a list bullet. 24 1 25 2015-10-05 Myles C. Maxfield <mmaxfield@apple.com> 2 26 -
trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js
r190426 r190571 364 364 for (var parameter of this._extraParameters) { 365 365 var listItemElement = this._extraElementsList.appendChild(document.createElement("li")); 366 var forceObjectExpansion = parameter.type === "object" && (parameter.subtype !== "null" && parameter.subtype !== "regexp" && parameter.subtype !== "node");366 const forceObjectFormat = parameter.type === "object" && (parameter.subtype !== "null" && parameter.subtype !== "regexp" && parameter.subtype !== "node" && parameter.subtype !== "error"); 367 367 listItemElement.classList.add("console-message-extra-parameter"); 368 listItemElement.appendChild(this._formatParameter(parameter, forceObject Expansion));368 listItemElement.appendChild(this._formatParameter(parameter, forceObjectFormat)); 369 369 } 370 370 } … … 504 504 var formatter = formatters[type] || this._formatParameterAsValue; 505 505 506 var span = document.createElement("span");507 formatter.call(this, parameter, span, forceObjectFormat);508 return span;509 } 510 511 _formatParameterAsValue(value, element)512 { 513 element.appendChild(WebInspector.FormattedValue.createElementForRemoteObject(value));514 } 515 516 _formatParameterAsString(object, element)517 { 518 element.appendChild(WebInspector.FormattedValue.createLinkifiedElementString(object.description));519 } 520 521 _formatParameterAsNode(object, element)522 { 523 element.appendChild(WebInspector.FormattedValue.createElementForNode(object));524 } 525 526 _formatParameterAsObject(object, element, forceExpansion)506 const fragment = document.createDocumentFragment(); 507 formatter.call(this, parameter, fragment); 508 return fragment; 509 } 510 511 _formatParameterAsValue(value, fragment) 512 { 513 fragment.appendChild(WebInspector.FormattedValue.createElementForRemoteObject(value)); 514 } 515 516 _formatParameterAsString(object, fragment) 517 { 518 fragment.appendChild(WebInspector.FormattedValue.createLinkifiedElementString(object.description)); 519 } 520 521 _formatParameterAsNode(object, fragment) 522 { 523 fragment.appendChild(WebInspector.FormattedValue.createElementForNode(object)); 524 } 525 526 _formatParameterAsObject(object, fragment, forceExpansion) 527 527 { 528 528 // FIXME: Should have a better ObjectTreeView mode for classes (static methods and methods). 529 529 this._objectTree = new WebInspector.ObjectTreeView(object, null, this._rootPropertyPathForObject(object), forceExpansion); 530 element.appendChild(this._objectTree.element);531 } 532 533 _formatParameterAsError(object, element)534 { 535 var errorObjectView= new WebInspector.ErrorObjectView(object);536 element.appendChild(errorObjectView.element);537 } 538 539 _formatParameterAsArray(array, element)530 fragment.appendChild(this._objectTree.element); 531 } 532 533 _formatParameterAsError(object, fragment) 534 { 535 this._objectTree = new WebInspector.ErrorObjectView(object); 536 fragment.appendChild(this._objectTree.element); 537 } 538 539 _formatParameterAsArray(array, fragment) 540 540 { 541 541 this._objectTree = new WebInspector.ObjectTreeView(array, WebInspector.ObjectTreeView.Mode.Properties, this._rootPropertyPathForObject(array)); 542 element.appendChild(this._objectTree.element);542 fragment.appendChild(this._objectTree.element); 543 543 } 544 544 -
trunk/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.css
r188017 r190571 23 23 * THE POSSIBILITY OF SUCH DAMAGE. 24 24 */ 25 26 .error-object { 27 display: inline-block; 28 } 25 29 26 30 .error-object::before {
Note: See TracChangeset
for help on using the changeset viewer.