Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193247 => 193248)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:01:48 UTC (rev 193247)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:01:53 UTC (rev 193248)
@@ -1,5 +1,33 @@
2015-12-02 Timothy Hatcher <[email protected]>
+ Merge r190571. rdar://problem/23221163
+
+ 2015-10-05 Nikita Vasilyev <[email protected]>
+
+ Web Inspector: Error displayed as an object when passed as a second argument to console.log
+ https://bugs.webkit.org/show_bug.cgi?id=149799
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/ConsoleMessageView.js:
+ (WebInspector.ConsoleMessageView.prototype._appendExtraParameters):
+ Don't format errors as objects.
+
+ (WebInspector.ConsoleMessageView.prototype._formatParameter):
+ (WebInspector.ConsoleMessageView.prototype._formatParameterAsValue):
+ (WebInspector.ConsoleMessageView.prototype._formatParameterAsString):
+ (WebInspector.ConsoleMessageView.prototype._formatParameterAsNode):
+ (WebInspector.ConsoleMessageView.prototype._formatParameterAsObject):
+ (WebInspector.ConsoleMessageView.prototype._formatParameterAsError):
+ (WebInspector.ConsoleMessageView.prototype._formatParameterAsArray):
+ Replace an unnecessary span element with a document fragment.
+
+ * UserInterface/Views/ErrorObjectView.css:
+ (.error-object):
+ Display an error object on the same line as a list bullet.
+
+2015-12-02 Timothy Hatcher <[email protected]>
+
Merge r190551. rdar://problem/23221163
2015-10-04 Nikita Vasilyev <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js (193247 => 193248)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-12-03 19:01:48 UTC (rev 193247)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js 2015-12-03 19:01:53 UTC (rev 193248)
@@ -363,9 +363,9 @@
for (var parameter of this._extraParameters) {
var listItemElement = this._extraElementsList.appendChild(document.createElement("li"));
- var forceObjectExpansion = parameter.type === "object" && (parameter.subtype !== "null" && parameter.subtype !== "regexp" && parameter.subtype !== "node");
+ var forceObjectFormat = parameter.type === "object" && (parameter.subtype !== "null" && parameter.subtype !== "regexp" && parameter.subtype !== "node" && parameter.subtype !== "error");
listItemElement.classList.add("console-message-extra-parameter");
- listItemElement.appendChild(this._formatParameter(parameter, forceObjectExpansion));
+ listItemElement.appendChild(this._formatParameter(parameter, forceObjectFormat));
}
}
@@ -503,43 +503,43 @@
var formatter = formatters[type] || this._formatParameterAsValue;
- var span = document.createElement("span");
- formatter.call(this, parameter, span, forceObjectFormat);
- return span;
+ var fragment = document.createDocumentFragment();
+ formatter.call(this, parameter, fragment);
+ return fragment;
}
- _formatParameterAsValue(value, element)
+ _formatParameterAsValue(value, fragment)
{
- element.appendChild(WebInspector.FormattedValue.createElementForRemoteObject(value));
+ fragment.appendChild(WebInspector.FormattedValue.createElementForRemoteObject(value));
}
- _formatParameterAsString(object, element)
+ _formatParameterAsString(object, fragment)
{
- element.appendChild(WebInspector.FormattedValue.createLinkifiedElementString(object.description));
+ fragment.appendChild(WebInspector.FormattedValue.createLinkifiedElementString(object.description));
}
- _formatParameterAsNode(object, element)
+ _formatParameterAsNode(object, fragment)
{
- element.appendChild(WebInspector.FormattedValue.createElementForNode(object));
+ fragment.appendChild(WebInspector.FormattedValue.createElementForNode(object));
}
- _formatParameterAsObject(object, element, forceExpansion)
+ _formatParameterAsObject(object, fragment, forceExpansion)
{
// FIXME: Should have a better ObjectTreeView mode for classes (static methods and methods).
this._objectTree = new WebInspector.ObjectTreeView(object, null, this._rootPropertyPathForObject(object), forceExpansion);
- element.appendChild(this._objectTree.element);
+ fragment.appendChild(this._objectTree.element);
}
- _formatParameterAsError(object, element)
+ _formatParameterAsError(object, fragment)
{
- var errorObjectView = new WebInspector.ErrorObjectView(object);
- element.appendChild(errorObjectView.element);
+ this._objectTree = new WebInspector.ErrorObjectView(object);
+ fragment.appendChild(this._objectTree.element);
}
- _formatParameterAsArray(array, element)
+ _formatParameterAsArray(array, fragment)
{
this._objectTree = new WebInspector.ObjectTreeView(array, WebInspector.ObjectTreeView.Mode.Properties, this._rootPropertyPathForObject(array));
- element.appendChild(this._objectTree.element);
+ fragment.appendChild(this._objectTree.element);
}
_rootPropertyPathForObject(object)
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.css (193247 => 193248)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.css 2015-12-03 19:01:48 UTC (rev 193247)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.css 2015-12-03 19:01:53 UTC (rev 193248)
@@ -23,6 +23,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+.error-object {
+ display: inline-block;
+}
+
.error-object::before {
display: inline-block;
vertical-align: baseline;
