Changeset 243260 in webkit
- Timestamp:
- Mar 20, 2019 4:53:03 PM (5 years ago)
- Location:
- trunk/Source/WebInspectorUI
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebInspectorUI/ChangeLog
r243256 r243260 1 2019-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 1 28 2019-03-20 Nikita Vasilyev <nvasilyev@apple.com> 2 29 -
trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
r243244 r243260 433 433 localizedStrings["Eval Code"] = "Eval Code"; 434 434 localizedStrings["Evaluate JavaScript"] = "Evaluate JavaScript"; 435 localizedStrings["Evaluations"] = "Evaluations"; 435 436 localizedStrings["Event"] = "Event"; 436 437 localizedStrings["Event Breakpoint\u2026"] = "Event Breakpoint\u2026"; -
trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleCommandView.js
r242992 r243260 28 28 */ 29 29 30 WI.ConsoleCommandView = class ConsoleCommandView extends WI.Object30 WI.ConsoleCommandView = class ConsoleCommandView 31 31 { 32 32 constructor(commandText, className) 33 33 { 34 super();35 36 34 this._commandText = commandText; 37 35 this._className = className || ""; -
trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.css
r242992 r243260 43 43 } 44 44 45 .log-scope-bar > li.unread.evaluations > .indicator { 46 background-color: darkgrey; 47 } 48 45 49 .log-scope-bar > li.unread.errors > .indicator { 46 50 background-color: hsl(0, 95%, 72%); -
trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js
r242604 r243260 85 85 let scopeBarItems = [ 86 86 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"}), 87 88 new WI.ScopeBarItem(WI.LogContentView.Scopes.Errors, WI.UIString("Errors"), {className: "errors"}), 88 89 new WI.ScopeBarItem(WI.LogContentView.Scopes.Warnings, WI.UIString("Warnings"), {className: "warnings"}), … … 226 227 target.connection.runAfterPendingDispatches(this._clearFocusableChildren.bind(this)); 227 228 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]); 236 236 } 237 237 … … 423 423 } 424 424 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); 432 428 if (item && !item.selected && !this._scopeBar.item(WI.LogContentView.Scopes.All).selected) 433 429 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); 434 439 } 435 440 … … 453 458 { 454 459 if (this._logViewController.updatePreviousMessageRepeatCount(event.data.count) && this._lastMessageView) 455 this._markScopeBarItem Unread(this._lastMessageView.message.level);460 this._markScopeBarItemForMessageLevelUnread(this._lastMessageView.message.level); 456 461 } 457 462 … … 824 829 _messageSourceBarSelectionDidChange(event) 825 830 { 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 } else831 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"); 832 837 833 838 this._filterMessageElements(this._allMessageElements()); … … 836 841 _scopeBarSelectionDidChange(event) 837 842 { 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"); 845 849 846 850 this._filterMessageElements(this._allMessageElements()); … … 850 854 { 851 855 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 854 860 visible = this._messageShouldBeVisible(messageElement.__message); 855 861 … … 1088 1094 1089 1095 let classList = message.classList; 1090 if (!isEmptyObject(matchRanges) || message.__commandView instanceof WI.ConsoleCommandView || message.__message instanceof WI.ConsoleCommandResultMessage)1096 if (!isEmptyObject(matchRanges)) 1091 1097 classList.remove(WI.LogContentView.FilteredOutBySearchStyleClassName); 1092 1098 else … … 1181 1187 WI.LogContentView.Scopes = { 1182 1188 All: "log-all", 1189 Debugs: "log-debugs", 1183 1190 Errors: "log-errors", 1191 Evaluations: "log-evaluations", 1192 Infos: "log-infos", 1193 Logs: "log-logs", 1184 1194 Warnings: "log-warnings", 1185 Logs: "log-logs", 1186 Infos: "log-infos", 1187 Debugs: "log-debugs", 1195 1188 1196 AllChannels: "log-all-channels", 1189 1197 Media: "log-media", 1198 MediaSource: "log-mediasource", 1190 1199 WebRTC: "log-webrtc", 1191 MediaSource: "log-mediasource",1192 1200 }; 1193 1201
Note: See TracChangeset
for help on using the changeset viewer.