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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
77 toolbar.appendToolbarItem(this._filterStatusText); | 77 toolbar.appendToolbarItem(this._filterStatusText); |
78 toolbar.appendSeparator(); | 78 toolbar.appendSeparator(); |
79 toolbar.appendToolbarItem(this._showSettingsPaneButton); | 79 toolbar.appendToolbarItem(this._showSettingsPaneButton); |
80 | 80 |
81 this._preserveLogCheckbox = new UI.ToolbarSettingCheckbox( | 81 this._preserveLogCheckbox = new UI.ToolbarSettingCheckbox( |
82 Common.moduleSetting('preserveConsoleLog'), Common.UIString('Do not clea r log on page reload / navigation'), | 82 Common.moduleSetting('preserveConsoleLog'), Common.UIString('Do not clea r log on page reload / navigation'), |
83 Common.UIString('Preserve log')); | 83 Common.UIString('Preserve log')); |
84 this._hideNetworkMessagesCheckbox = new UI.ToolbarSettingCheckbox( | 84 this._hideNetworkMessagesCheckbox = new UI.ToolbarSettingCheckbox( |
85 this._filter._hideNetworkMessagesSetting, this._filter._hideNetworkMessa gesSetting.title(), | 85 this._filter._hideNetworkMessagesSetting, this._filter._hideNetworkMessa gesSetting.title(), |
86 Common.UIString('Hide network')); | 86 Common.UIString('Hide network')); |
87 var filterByExecutionContextCheckbox = new UI.ToolbarSettingCheckbox( | |
88 this._filter._filterByExecutionContextSetting, | |
89 Common.UIString('Only show messages from the current context (top, ifram e, worker, extension)'), | |
pfeldman
2017/05/23 20:56:32
Do we need to repeat these captions in addition to
luoe
2017/05/23 21:03:44
I should make them consistent. They're only repea
| |
90 Common.UIString('Selected context only')); | |
91 var filterConsoleAPICheckbox = new UI.ToolbarSettingCheckbox( | |
92 Common.moduleSetting('consoleAPIFilterEnabled'), Common.UIString('Only s how messages from console.* methods'), | |
pfeldman
2017/05/23 20:56:32
ditto
| |
93 Common.UIString('User messages only')); | |
87 var monitoringXHREnabledSetting = Common.moduleSetting('monitoringXHREnabled '); | 94 var monitoringXHREnabledSetting = Common.moduleSetting('monitoringXHREnabled '); |
88 this._timestampsSetting = Common.moduleSetting('consoleTimestampsEnabled'); | 95 this._timestampsSetting = Common.moduleSetting('consoleTimestampsEnabled'); |
89 this._consoleHistoryAutocompleteSetting = Common.moduleSetting('consoleHisto ryAutocomplete'); | 96 this._consoleHistoryAutocompleteSetting = Common.moduleSetting('consoleHisto ryAutocomplete'); |
90 | 97 |
91 var settingsPane = new UI.HBox(); | 98 var settingsPane = new UI.HBox(); |
92 settingsPane.show(this._contentsElement); | 99 settingsPane.show(this._contentsElement); |
93 settingsPane.element.classList.add('console-settings-pane'); | 100 settingsPane.element.classList.add('console-settings-pane'); |
94 | 101 |
95 var settingsToolbarLeft = new UI.Toolbar('', settingsPane.element); | 102 var settingsToolbarLeft = new UI.Toolbar('', settingsPane.element); |
96 settingsToolbarLeft.makeVertical(); | 103 settingsToolbarLeft.makeVertical(); |
97 settingsToolbarLeft.appendToolbarItem(this._hideNetworkMessagesCheckbox); | 104 settingsToolbarLeft.appendToolbarItem(this._hideNetworkMessagesCheckbox); |
98 settingsToolbarLeft.appendToolbarItem(this._preserveLogCheckbox); | 105 settingsToolbarLeft.appendToolbarItem(this._preserveLogCheckbox); |
99 settingsToolbarLeft.appendToolbarItem(this._filter._filterByExecutionContext Checkbox); | 106 settingsToolbarLeft.appendToolbarItem(filterByExecutionContextCheckbox); |
107 settingsToolbarLeft.appendToolbarItem(filterConsoleAPICheckbox); | |
100 | 108 |
101 var settingsToolbarRight = new UI.Toolbar('', settingsPane.element); | 109 var settingsToolbarRight = new UI.Toolbar('', settingsPane.element); |
102 settingsToolbarRight.makeVertical(); | 110 settingsToolbarRight.makeVertical(); |
103 settingsToolbarRight.appendToolbarItem(new UI.ToolbarSettingCheckbox(monitor ingXHREnabledSetting)); | 111 settingsToolbarRight.appendToolbarItem(new UI.ToolbarSettingCheckbox(monitor ingXHREnabledSetting)); |
104 settingsToolbarRight.appendToolbarItem(new UI.ToolbarSettingCheckbox(this._t imestampsSetting)); | 112 settingsToolbarRight.appendToolbarItem(new UI.ToolbarSettingCheckbox(this._t imestampsSetting)); |
105 settingsToolbarRight.appendToolbarItem(new UI.ToolbarSettingCheckbox(this._c onsoleHistoryAutocompleteSetting)); | 113 settingsToolbarRight.appendToolbarItem(new UI.ToolbarSettingCheckbox(this._c onsoleHistoryAutocompleteSetting)); |
106 if (!this._showSettingsPaneSetting.get()) | 114 if (!this._showSettingsPaneSetting.get()) |
107 settingsPane.element.classList.add('hidden'); | 115 settingsPane.element.classList.add('hidden'); |
108 this._showSettingsPaneSetting.addChangeListener( | 116 this._showSettingsPaneSetting.addChangeListener( |
109 () => settingsPane.element.classList.toggle('hidden', !this._showSetting sPaneSetting.get())); | 117 () => settingsPane.element.classList.toggle('hidden', !this._showSetting sPaneSetting.get())); |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
277 this._addConsoleMessage(consoleMessage); | 285 this._addConsoleMessage(consoleMessage); |
278 } | 286 } |
279 | 287 |
280 _consoleTimestampsSettingChanged() { | 288 _consoleTimestampsSettingChanged() { |
281 this._updateMessageList(); | 289 this._updateMessageList(); |
282 this._consoleMessages.forEach(viewMessage => viewMessage.updateTimestamp()); | 290 this._consoleMessages.forEach(viewMessage => viewMessage.updateTimestamp()); |
283 } | 291 } |
284 | 292 |
285 _executionContextChanged() { | 293 _executionContextChanged() { |
286 this._prompt.clearAutocomplete(); | 294 this._prompt.clearAutocomplete(); |
287 if (this._filter._filterByExecutionContextCheckbox.checked()) | 295 if (this._filter._filterByExecutionContextSetting.get()) |
288 this._updateMessageList(); | 296 this._updateMessageList(); |
289 } | 297 } |
290 | 298 |
291 /** | 299 /** |
292 * @override | 300 * @override |
293 */ | 301 */ |
294 willHide() { | 302 willHide() { |
295 this._hidePromptSuggestBox(); | 303 this._hidePromptSuggestBox(); |
296 } | 304 } |
297 | 305 |
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
989 Console.ConsoleView.persistedHistorySize = 300; | 997 Console.ConsoleView.persistedHistorySize = 300; |
990 | 998 |
991 /** | 999 /** |
992 * @unrestricted | 1000 * @unrestricted |
993 */ | 1001 */ |
994 Console.ConsoleViewFilter = class { | 1002 Console.ConsoleViewFilter = class { |
995 /** | 1003 /** |
996 * @param {function()} filterChangedCallback | 1004 * @param {function()} filterChangedCallback |
997 */ | 1005 */ |
998 constructor(filterChangedCallback) { | 1006 constructor(filterChangedCallback) { |
999 this._filterByExecutionContextCheckbox = new UI.ToolbarCheckbox( | |
1000 Common.UIString('Selected context only'), | |
1001 Common.UIString('Only show messages from the current context (top, ifram e, worker, extension)'), | |
1002 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 '); |
1013 this._filterByExecutionContextSetting = Common.moduleSetting('selectedContex tFilterEnabled'); | |
1014 this._filterByConsoleAPISetting = Common.moduleSetting('consoleAPIFilterEnab led'); | |
1009 | 1015 |
1010 this._messageURLFiltersSetting.addChangeListener(this._filterChanged); | 1016 this._messageURLFiltersSetting.addChangeListener(this._filterChanged); |
1011 this._messageLevelFiltersSetting.addChangeListener(this._filterChanged); | 1017 this._messageLevelFiltersSetting.addChangeListener(this._filterChanged); |
1012 this._hideNetworkMessagesSetting.addChangeListener(this._filterChanged); | 1018 this._hideNetworkMessagesSetting.addChangeListener(this._filterChanged); |
1019 this._filterByExecutionContextSetting.addChangeListener(this._filterChanged) ; | |
1020 this._filterByConsoleAPISetting.addChangeListener(this._filterChanged); | |
1013 | 1021 |
1014 this._textFilterUI = new UI.ToolbarInput(Common.UIString('Filter'), 0.2, 1, true); | 1022 this._textFilterUI = new UI.ToolbarInput(Common.UIString('Filter'), 0.2, 1, true); |
1015 this._textFilterUI.addEventListener(UI.ToolbarInput.Event.TextChanged, this. _textFilterChanged, this); | 1023 this._textFilterUI.addEventListener(UI.ToolbarInput.Event.TextChanged, this. _textFilterChanged, this); |
1016 | 1024 |
1017 var levels = [ | 1025 var levels = [ |
1018 {value: ConsoleModel.ConsoleMessage.MessageLevel.Verbose, label: Common.UI String('Verbose')}, | 1026 {value: ConsoleModel.ConsoleMessage.MessageLevel.Verbose, label: Common.UI String('Verbose')}, |
1019 {value: ConsoleModel.ConsoleMessage.MessageLevel.Info, label: Common.UIStr ing('Info'), default: true}, | 1027 {value: ConsoleModel.ConsoleMessage.MessageLevel.Info, label: Common.UIStr ing('Info'), default: true}, |
1020 {value: ConsoleModel.ConsoleMessage.MessageLevel.Warning, label: Common.UI String('Warnings')}, | 1028 {value: ConsoleModel.ConsoleMessage.MessageLevel.Warning, label: Common.UI String('Warnings')}, |
1021 {value: ConsoleModel.ConsoleMessage.MessageLevel.Error, label: Common.UISt ring('Errors')} | 1029 {value: ConsoleModel.ConsoleMessage.MessageLevel.Error, label: Common.UISt ring('Errors')} |
1022 ]; | 1030 ]; |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1068 } | 1076 } |
1069 | 1077 |
1070 /** | 1078 /** |
1071 * @param {!Console.ConsoleViewMessage} viewMessage | 1079 * @param {!Console.ConsoleViewMessage} viewMessage |
1072 * @return {boolean} | 1080 * @return {boolean} |
1073 */ | 1081 */ |
1074 shouldBeVisible(viewMessage) { | 1082 shouldBeVisible(viewMessage) { |
1075 var message = viewMessage.consoleMessage(); | 1083 var message = viewMessage.consoleMessage(); |
1076 var executionContext = UI.context.flavor(SDK.ExecutionContext); | 1084 var executionContext = UI.context.flavor(SDK.ExecutionContext); |
1077 | 1085 |
1078 if (this._filterByExecutionContextCheckbox.checked() && executionContext) { | 1086 if (this._filterByExecutionContextSetting.get() && executionContext) { |
1079 if (message.runtimeModel() !== executionContext.runtimeModel) | 1087 if (message.runtimeModel() !== executionContext.runtimeModel) |
1080 return false; | 1088 return false; |
1081 if (message.executionContextId && message.executionContextId !== execution Context.id) | 1089 if (message.executionContextId && message.executionContextId !== execution Context.id) |
1082 return false; | 1090 return false; |
1083 } | 1091 } |
1084 | 1092 |
1085 if (this._hideNetworkMessagesSetting.get() && | 1093 if (this._hideNetworkMessagesSetting.get() && |
1086 viewMessage.consoleMessage().source === ConsoleModel.ConsoleMessage.Mess ageSource.Network) | 1094 viewMessage.consoleMessage().source === ConsoleModel.ConsoleMessage.Mess ageSource.Network) |
1087 return false; | 1095 return false; |
1088 | 1096 |
(...skipping 13 matching lines...) Expand all Loading... | |
1102 return false; | 1110 return false; |
1103 | 1111 |
1104 if (this._filterRegex) { | 1112 if (this._filterRegex) { |
1105 if (!viewMessage.matchesFilterRegex(this._filterRegex)) | 1113 if (!viewMessage.matchesFilterRegex(this._filterRegex)) |
1106 return false; | 1114 return false; |
1107 } else if (this._filterText) { | 1115 } else if (this._filterText) { |
1108 if (!viewMessage.matchesFilterText(this._filterText)) | 1116 if (!viewMessage.matchesFilterText(this._filterText)) |
1109 return false; | 1117 return false; |
1110 } | 1118 } |
1111 | 1119 |
1120 if (this._filterByConsoleAPISetting.get() && | |
1121 message.source !== ConsoleModel.ConsoleMessage.MessageSource.ConsoleAPI) | |
1122 return false; | |
1123 | |
1112 return true; | 1124 return true; |
1113 } | 1125 } |
1114 | 1126 |
1115 reset() { | 1127 reset() { |
1116 this._messageURLFiltersSetting.set({}); | 1128 this._messageURLFiltersSetting.set({}); |
1117 this._messageLevelFiltersSetting.set(ConsoleModel.ConsoleMessage.MessageLeve l.Info); | 1129 this._messageLevelFiltersSetting.set(ConsoleModel.ConsoleMessage.MessageLeve l.Info); |
1118 this._filterByExecutionContextCheckbox.inputElement.checked = false; | 1130 this._filterByExecutionContextSetting.set(false); |
1131 this._filterByConsoleAPISetting.set(false); | |
1119 this._hideNetworkMessagesSetting.set(false); | 1132 this._hideNetworkMessagesSetting.set(false); |
1120 this._textFilterUI.setValue(''); | 1133 this._textFilterUI.setValue(''); |
1121 this._textFilterChanged(); | 1134 this._textFilterChanged(); |
1122 } | 1135 } |
1123 }; | 1136 }; |
1124 | 1137 |
1125 /** | 1138 /** |
1126 * @unrestricted | 1139 * @unrestricted |
1127 */ | 1140 */ |
1128 Console.ConsoleCommand = class extends Console.ConsoleViewMessage { | 1141 Console.ConsoleCommand = class extends Console.ConsoleViewMessage { |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1276 return true; | 1289 return true; |
1277 } | 1290 } |
1278 return false; | 1291 return false; |
1279 } | 1292 } |
1280 }; | 1293 }; |
1281 | 1294 |
1282 /** | 1295 /** |
1283 * @typedef {{messageIndex: number, matchIndex: number}} | 1296 * @typedef {{messageIndex: number, matchIndex: number}} |
1284 */ | 1297 */ |
1285 Console.ConsoleView.RegexMatchRange; | 1298 Console.ConsoleView.RegexMatchRange; |
OLD | NEW |