OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. |
3 * Copyright (C) 2009 Joseph Pecoraro | 3 * Copyright (C) 2009 Joseph Pecoraro |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * | 8 * |
9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
90 | 90 |
91 var settingsPane = new UI.HBox(); | 91 var settingsPane = new UI.HBox(); |
92 settingsPane.show(this._contentsElement); | 92 settingsPane.show(this._contentsElement); |
93 settingsPane.element.classList.add('console-settings-pane'); | 93 settingsPane.element.classList.add('console-settings-pane'); |
94 | 94 |
95 var settingsToolbarLeft = new UI.Toolbar('', settingsPane.element); | 95 var settingsToolbarLeft = new UI.Toolbar('', settingsPane.element); |
96 settingsToolbarLeft.makeVertical(); | 96 settingsToolbarLeft.makeVertical(); |
97 settingsToolbarLeft.appendToolbarItem(this._hideNetworkMessagesCheckbox); | 97 settingsToolbarLeft.appendToolbarItem(this._hideNetworkMessagesCheckbox); |
98 settingsToolbarLeft.appendToolbarItem(this._preserveLogCheckbox); | 98 settingsToolbarLeft.appendToolbarItem(this._preserveLogCheckbox); |
99 settingsToolbarLeft.appendToolbarItem(this._filter._filterByExecutionContext Checkbox); | 99 settingsToolbarLeft.appendToolbarItem(this._filter._filterByExecutionContext Checkbox); |
100 settingsToolbarLeft.appendToolbarItem(this._filter._filterConsoleAPICheckbox ); | |
100 | 101 |
101 var settingsToolbarRight = new UI.Toolbar('', settingsPane.element); | 102 var settingsToolbarRight = new UI.Toolbar('', settingsPane.element); |
102 settingsToolbarRight.makeVertical(); | 103 settingsToolbarRight.makeVertical(); |
103 settingsToolbarRight.appendToolbarItem(new UI.ToolbarSettingCheckbox(monitor ingXHREnabledSetting)); | 104 settingsToolbarRight.appendToolbarItem(new UI.ToolbarSettingCheckbox(monitor ingXHREnabledSetting)); |
104 settingsToolbarRight.appendToolbarItem(new UI.ToolbarSettingCheckbox(this._t imestampsSetting)); | 105 settingsToolbarRight.appendToolbarItem(new UI.ToolbarSettingCheckbox(this._t imestampsSetting)); |
105 settingsToolbarRight.appendToolbarItem(new UI.ToolbarSettingCheckbox(this._c onsoleHistoryAutocompleteSetting)); | 106 settingsToolbarRight.appendToolbarItem(new UI.ToolbarSettingCheckbox(this._c onsoleHistoryAutocompleteSetting)); |
106 if (!this._showSettingsPaneSetting.get()) | 107 if (!this._showSettingsPaneSetting.get()) |
107 settingsPane.element.classList.add('hidden'); | 108 settingsPane.element.classList.add('hidden'); |
108 this._showSettingsPaneSetting.addChangeListener( | 109 this._showSettingsPaneSetting.addChangeListener( |
109 () => settingsPane.element.classList.toggle('hidden', !this._showSetting sPaneSetting.get())); | 110 () => settingsPane.element.classList.toggle('hidden', !this._showSetting sPaneSetting.get())); |
(...skipping 883 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
993 */ | 994 */ |
994 Console.ConsoleViewFilter = class { | 995 Console.ConsoleViewFilter = class { |
995 /** | 996 /** |
996 * @param {function()} filterChangedCallback | 997 * @param {function()} filterChangedCallback |
997 */ | 998 */ |
998 constructor(filterChangedCallback) { | 999 constructor(filterChangedCallback) { |
999 this._filterByExecutionContextCheckbox = new UI.ToolbarCheckbox( | 1000 this._filterByExecutionContextCheckbox = new UI.ToolbarCheckbox( |
1000 Common.UIString('Selected context only'), | 1001 Common.UIString('Selected context only'), |
1001 Common.UIString('Only show messages from the current context (top, ifram e, worker, extension)'), | 1002 Common.UIString('Only show messages from the current context (top, ifram e, worker, extension)'), |
1002 filterChangedCallback); | 1003 filterChangedCallback); |
1004 this._filterConsoleAPICheckbox = new UI.ToolbarCheckbox( | |
pfeldman
2017/05/23 18:59:26
Convert it into a setting for consistency and assi
luoe
2017/05/23 20:28:51
Done. 'selected context only' was also wasn't a s
| |
1005 Common.UIString('User messages only'), | |
1006 Common.UIString('Only show messages from console.* methods and evaluatio ns'), filterChangedCallback); | |
1003 this._filterChanged = filterChangedCallback; | 1007 this._filterChanged = filterChangedCallback; |
1004 | 1008 |
1005 this._messageURLFiltersSetting = Common.settings.createSetting('messageURLFi lters', {}); | 1009 this._messageURLFiltersSetting = Common.settings.createSetting('messageURLFi lters', {}); |
1006 this._messageLevelFiltersSetting = | 1010 this._messageLevelFiltersSetting = |
1007 Common.settings.createSetting('messageLevelFilters2', ConsoleModel.Conso leMessage.MessageLevel.Info); | 1011 Common.settings.createSetting('messageLevelFilters2', ConsoleModel.Conso leMessage.MessageLevel.Info); |
1008 this._hideNetworkMessagesSetting = Common.moduleSetting('hideNetworkMessages '); | 1012 this._hideNetworkMessagesSetting = Common.moduleSetting('hideNetworkMessages '); |
1009 | 1013 |
1010 this._messageURLFiltersSetting.addChangeListener(this._filterChanged); | 1014 this._messageURLFiltersSetting.addChangeListener(this._filterChanged); |
1011 this._messageLevelFiltersSetting.addChangeListener(this._filterChanged); | 1015 this._messageLevelFiltersSetting.addChangeListener(this._filterChanged); |
1012 this._hideNetworkMessagesSetting.addChangeListener(this._filterChanged); | 1016 this._hideNetworkMessagesSetting.addChangeListener(this._filterChanged); |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1102 return false; | 1106 return false; |
1103 | 1107 |
1104 if (this._filterRegex) { | 1108 if (this._filterRegex) { |
1105 if (!viewMessage.matchesFilterRegex(this._filterRegex)) | 1109 if (!viewMessage.matchesFilterRegex(this._filterRegex)) |
1106 return false; | 1110 return false; |
1107 } else if (this._filterText) { | 1111 } else if (this._filterText) { |
1108 if (!viewMessage.matchesFilterText(this._filterText)) | 1112 if (!viewMessage.matchesFilterText(this._filterText)) |
1109 return false; | 1113 return false; |
1110 } | 1114 } |
1111 | 1115 |
1116 if (this._filterConsoleAPICheckbox.checked() && | |
1117 message.source !== ConsoleModel.ConsoleMessage.MessageSource.ConsoleAPI) | |
1118 return false; | |
1119 | |
1112 return true; | 1120 return true; |
1113 } | 1121 } |
1114 | 1122 |
1115 reset() { | 1123 reset() { |
1116 this._messageURLFiltersSetting.set({}); | 1124 this._messageURLFiltersSetting.set({}); |
1117 this._messageLevelFiltersSetting.set(ConsoleModel.ConsoleMessage.MessageLeve l.Info); | 1125 this._messageLevelFiltersSetting.set(ConsoleModel.ConsoleMessage.MessageLeve l.Info); |
1118 this._filterByExecutionContextCheckbox.inputElement.checked = false; | 1126 this._filterByExecutionContextCheckbox.inputElement.checked = false; |
1119 this._hideNetworkMessagesSetting.set(false); | 1127 this._hideNetworkMessagesSetting.set(false); |
1120 this._textFilterUI.setValue(''); | 1128 this._textFilterUI.setValue(''); |
1121 this._textFilterChanged(); | 1129 this._textFilterChanged(); |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1276 return true; | 1284 return true; |
1277 } | 1285 } |
1278 return false; | 1286 return false; |
1279 } | 1287 } |
1280 }; | 1288 }; |
1281 | 1289 |
1282 /** | 1290 /** |
1283 * @typedef {{messageIndex: number, matchIndex: number}} | 1291 * @typedef {{messageIndex: number, matchIndex: number}} |
1284 */ | 1292 */ |
1285 Console.ConsoleView.RegexMatchRange; | 1293 Console.ConsoleView.RegexMatchRange; |
OLD | NEW |