Changeset 243260 in webkit


Ignore:
Timestamp:
Mar 20, 2019 4:53:03 PM (5 years ago)
Author:
Devin Rousso
Message:

Web Inspector: no way to filter out all console messages or all evaluations/results
https://bugs.webkit.org/show_bug.cgi?id=167035
<rdar://problem/30023523>

Reviewed by Timothy Hatcher.

  • UserInterface/Views/LogContentView.js:

(WI.LogContentView):
(WI.LogContentView.prototype.didAppendConsoleMessageView):
(WI.LogContentView.prototype._markScopeBarItemUnread):
(WI.LogContentView.prototype._markScopeBarItemForMessageLevelUnread): Added.
(WI.LogContentView.prototype._previousMessageRepeatCountUpdated):
(WI.LogContentView.prototype._messageSourceBarSelectionDidChange):
(WI.LogContentView.prototype._scopeBarSelectionDidChange):
(WI.LogContentView.prototype._filterMessageElements):
(WI.LogContentView.prototype.performSearch):

  • UserInterface/Views/LogContentView.css:

(.log-scope-bar > li.unread.evaluations::before): Added.

  • UserInterface/Views/ConsoleCommandView.js:

(WI.ConsoleCommandView):
Drive-by: remove unnecessary super-class extends.

  • Localizations/en.lproj/localizedStrings.js:
Location:
trunk/Source/WebInspectorUI
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebInspectorUI/ChangeLog

    r243256 r243260  
     12019-03-20  Devin Rousso  <drousso@apple.com>
     2
     3        Web Inspector: no way to filter out all console messages or all evaluations/results
     4        https://bugs.webkit.org/show_bug.cgi?id=167035
     5        <rdar://problem/30023523>
     6
     7        Reviewed by Timothy Hatcher.
     8
     9        * UserInterface/Views/LogContentView.js:
     10        (WI.LogContentView):
     11        (WI.LogContentView.prototype.didAppendConsoleMessageView):
     12        (WI.LogContentView.prototype._markScopeBarItemUnread):
     13        (WI.LogContentView.prototype._markScopeBarItemForMessageLevelUnread): Added.
     14        (WI.LogContentView.prototype._previousMessageRepeatCountUpdated):
     15        (WI.LogContentView.prototype._messageSourceBarSelectionDidChange):
     16        (WI.LogContentView.prototype._scopeBarSelectionDidChange):
     17        (WI.LogContentView.prototype._filterMessageElements):
     18        (WI.LogContentView.prototype.performSearch):
     19        * UserInterface/Views/LogContentView.css:
     20        (.log-scope-bar > li.unread.evaluations::before): Added.
     21
     22        * UserInterface/Views/ConsoleCommandView.js:
     23        (WI.ConsoleCommandView):
     24        Drive-by: remove unnecessary super-class extends.
     25
     26        * Localizations/en.lproj/localizedStrings.js:
     27
    1282019-03-20  Nikita Vasilyev  <nvasilyev@apple.com>
    229
  • trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js

    r243244 r243260  
    433433localizedStrings["Eval Code"] = "Eval Code";
    434434localizedStrings["Evaluate JavaScript"] = "Evaluate JavaScript";
     435localizedStrings["Evaluations"] = "Evaluations";
    435436localizedStrings["Event"] = "Event";
    436437localizedStrings["Event Breakpoint\u2026"] = "Event Breakpoint\u2026";
  • trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleCommandView.js

    r242992 r243260  
    2828 */
    2929
    30 WI.ConsoleCommandView = class ConsoleCommandView extends WI.Object
     30WI.ConsoleCommandView = class ConsoleCommandView
    3131{
    3232    constructor(commandText, className)
    3333    {
    34         super();
    35 
    3634        this._commandText = commandText;
    3735        this._className = className || "";
  • trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css

    r242992 r243260  
    4343}
    4444
     45.log-scope-bar > li.unread.evaluations > .indicator {
     46    background-color: darkgrey;
     47}
     48
    4549.log-scope-bar > li.unread.errors > .indicator {
    4650    background-color: hsl(0, 95%, 72%);
  • trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js

    r242604 r243260  
    8585        let scopeBarItems = [
    8686            new WI.ScopeBarItem(WI.LogContentView.Scopes.All, WI.UIString("All"), {exclusive: true}),
     87            new WI.ScopeBarItem(WI.LogContentView.Scopes.Evaluations, WI.UIString("Evaluations"), {className: "evaluations"}),
    8788            new WI.ScopeBarItem(WI.LogContentView.Scopes.Errors, WI.UIString("Errors"), {className: "errors"}),
    8889            new WI.ScopeBarItem(WI.LogContentView.Scopes.Warnings, WI.UIString("Warnings"), {className: "warnings"}),
     
    226227        target.connection.runAfterPendingDispatches(this._clearFocusableChildren.bind(this));
    227228
    228         if (type && type !== WI.ConsoleMessage.MessageType.EndGroup) {
    229             console.assert(messageView.message instanceof WI.ConsoleMessage);
    230             if (!(messageView.message instanceof WI.ConsoleCommandResultMessage))
    231                 this._markScopeBarItemUnread(messageView.message.level);
    232 
    233             console.assert(messageView.element instanceof Element);
    234             this._filterMessageElements([messageView.element]);
    235         }
     229        if (messageView instanceof WI.ConsoleCommandView || messageView.message instanceof WI.ConsoleCommandResultMessage)
     230            this._markScopeBarItemUnread(WI.LogContentView.Scopes.Evaluations);
     231        else
     232            this._markScopeBarItemForMessageLevelUnread(messageView.message.level);
     233
     234        console.assert(messageView.element instanceof Element);
     235        this._filterMessageElements([messageView.element]);
    236236    }
    237237
     
    423423    }
    424424
    425     _markScopeBarItemUnread(level)
    426     {
    427         let messageLevel = this._scopeFromMessageLevel(level);
    428         if (!messageLevel)
    429             return;
    430 
    431         let item = this._scopeBar.item(messageLevel);
     425    _markScopeBarItemUnread(scope)
     426    {
     427        let item = this._scopeBar.item(scope);
    432428        if (item && !item.selected && !this._scopeBar.item(WI.LogContentView.Scopes.All).selected)
    433429            item.element.classList.add("unread");
     430    }
     431
     432    _markScopeBarItemForMessageLevelUnread(level)
     433    {
     434        let scope = this._scopeFromMessageLevel(level);
     435        if (!scope)
     436            return;
     437
     438        this._markScopeBarItemUnread(scope);
    434439    }
    435440
     
    453458    {
    454459        if (this._logViewController.updatePreviousMessageRepeatCount(event.data.count) && this._lastMessageView)
    455             this._markScopeBarItemUnread(this._lastMessageView.message.level);
     460            this._markScopeBarItemForMessageLevelUnread(this._lastMessageView.message.level);
    456461    }
    457462
     
    824829    _messageSourceBarSelectionDidChange(event)
    825830    {
    826         let selectedItem = this._messageSourceBar.selectedItems[0];
    827         if (selectedItem.id === WI.LogContentView.Scopes.AllChannels) {
    828             for (let item of this._messageSourceBar.items)
    829                 item.element.classList.remove("unread");
    830         } else
    831             selectedItem.element.classList.remove("unread");
     831        let items = this._messageSourceBar.selectedItems;
     832        if (items.some((item) => item.id === WI.LogContentView.Scopes.AllChannels))
     833            items = this._messageSourceBar.items;
     834
     835        for (let item of items)
     836            item.element.classList.remove("unread");
    832837
    833838        this._filterMessageElements(this._allMessageElements());
     
    836841    _scopeBarSelectionDidChange(event)
    837842    {
    838         let selectedItem = this._scopeBar.selectedItems[0];
    839 
    840         if (selectedItem.id === WI.LogContentView.Scopes.All) {
    841             for (let item of this._scopeBar.items)
    842                 item.element.classList.remove("unread");
    843         } else
    844             selectedItem.element.classList.remove("unread");
     843        let items = this._scopeBar.selectedItems;
     844        if (items.some((item) => item.id === WI.LogContentView.Scopes.All))
     845            items = this._scopeBar.items;
     846
     847        for (let item of items)
     848            item.element.classList.remove("unread");
    845849
    846850        this._filterMessageElements(this._allMessageElements());
     
    850854    {
    851855        messageElements.forEach(function(messageElement) {
    852             let visible = messageElement.__commandView instanceof WI.ConsoleCommandView || messageElement.__message instanceof WI.ConsoleCommandResultMessage;
    853             if (!visible)
     856            let visible = false;
     857            if (messageElement.__commandView instanceof WI.ConsoleCommandView || messageElement.__message instanceof WI.ConsoleCommandResultMessage)
     858                visible = this._scopeBar.selectedItems.some((item) => item.id === WI.LogContentView.Scopes.Evaluations || item.id === WI.LogContentView.Scopes.All);
     859            else
    854860                visible = this._messageShouldBeVisible(messageElement.__message);
    855861
     
    10881094
    10891095            let classList = message.classList;
    1090             if (!isEmptyObject(matchRanges) || message.__commandView instanceof WI.ConsoleCommandView || message.__message instanceof WI.ConsoleCommandResultMessage)
     1096            if (!isEmptyObject(matchRanges))
    10911097                classList.remove(WI.LogContentView.FilteredOutBySearchStyleClassName);
    10921098            else
     
    11811187WI.LogContentView.Scopes = {
    11821188    All: "log-all",
     1189    Debugs: "log-debugs",
    11831190    Errors: "log-errors",
     1191    Evaluations: "log-evaluations",
     1192    Infos: "log-infos",
     1193    Logs: "log-logs",
    11841194    Warnings: "log-warnings",
    1185     Logs: "log-logs",
    1186     Infos: "log-infos",
    1187     Debugs: "log-debugs",
     1195
    11881196    AllChannels: "log-all-channels",
    11891197    Media: "log-media",
     1198    MediaSource: "log-mediasource",
    11901199    WebRTC: "log-webrtc",
    1191     MediaSource: "log-mediasource",
    11921200};
    11931201
Note: See TracChangeset for help on using the changeset viewer.