Changeset 190571 in webkit


Ignore:
Timestamp:
Oct 5, 2015 1:00:24 PM (8 years ago)
Author:
Nikita Vasilyev
Message:

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.

Location:
trunk/Source/WebInspectorUI
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebInspectorUI/ChangeLog

    r190564 r190571  
     12015-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
    1252015-10-05  Myles C. Maxfield  <mmaxfield@apple.com>
    226
  • trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.js

    r190426 r190571  
    364364        for (var parameter of this._extraParameters) {
    365365            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");
    367367            listItemElement.classList.add("console-message-extra-parameter");
    368             listItemElement.appendChild(this._formatParameter(parameter, forceObjectExpansion));
     368            listItemElement.appendChild(this._formatParameter(parameter, forceObjectFormat));
    369369        }
    370370    }
     
    504504        var formatter = formatters[type] || this._formatParameterAsValue;
    505505
    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)
    527527    {
    528528        // FIXME: Should have a better ObjectTreeView mode for classes (static methods and methods).
    529529        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)
    540540    {
    541541        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);
    543543    }
    544544
  • trunk/Source/WebInspectorUI/UserInterface/Views/ErrorObjectView.css

    r188017 r190571  
    2323 * THE POSSIBILITY OF SUCH DAMAGE.
    2424 */
     25
     26.error-object {
     27    display: inline-block;
     28}
    2529
    2630.error-object::before {
Note: See TracChangeset for help on using the changeset viewer.