| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 this._visibleViewMessages = []; | 48 this._visibleViewMessages = []; |
| 49 this._urlToMessageCount = {}; | 49 this._urlToMessageCount = {}; |
| 50 this._hiddenByFilterCount = 0; | 50 this._hiddenByFilterCount = 0; |
| 51 | 51 |
| 52 /** | 52 /** |
| 53 * @type {!Array.<!Console.ConsoleView.RegexMatchRange>} | 53 * @type {!Array.<!Console.ConsoleView.RegexMatchRange>} |
| 54 */ | 54 */ |
| 55 this._regexMatchRanges = []; | 55 this._regexMatchRanges = []; |
| 56 this._filter = new Console.ConsoleViewFilter(this._updateMessageList.bind(th
is)); | 56 this._filter = new Console.ConsoleViewFilter(this._updateMessageList.bind(th
is)); |
| 57 | 57 |
| 58 this._executionContextComboBox = new UI.ToolbarComboBox(null, 'console-conte
xt'); | 58 this._consoleContextSelector = new Console.ConsoleContextSelector(); |
| 59 this._executionContextComboBox.setMaxWidth(80); | |
| 60 this._consoleContextSelector = new Console.ConsoleContextSelector(this._exec
utionContextComboBox.selectElement()); | |
| 61 | 59 |
| 62 this._filterStatusText = new UI.ToolbarText(); | 60 this._filterStatusText = new UI.ToolbarText(); |
| 63 this._filterStatusText.element.classList.add('dimmed'); | 61 this._filterStatusText.element.classList.add('dimmed'); |
| 64 this._showSettingsPaneSetting = Common.settings.createSetting('consoleShowSe
ttingsToolbar', false); | 62 this._showSettingsPaneSetting = Common.settings.createSetting('consoleShowSe
ttingsToolbar', false); |
| 65 this._showSettingsPaneButton = new UI.ToolbarSettingToggle( | 63 this._showSettingsPaneButton = new UI.ToolbarSettingToggle( |
| 66 this._showSettingsPaneSetting, 'largeicon-settings-gear', Common.UIStrin
g('Console settings')); | 64 this._showSettingsPaneSetting, 'largeicon-settings-gear', Common.UIStrin
g('Console settings')); |
| 67 this._progressToolbarItem = new UI.ToolbarItem(createElement('div')); | 65 this._progressToolbarItem = new UI.ToolbarItem(createElement('div')); |
| 68 | 66 |
| 69 var toolbar = new UI.Toolbar('', this._contentsElement); | 67 var toolbar = new UI.Toolbar('', this._contentsElement); |
| 70 toolbar.appendToolbarItem(UI.Toolbar.createActionButton( | 68 toolbar.appendToolbarItem(UI.Toolbar.createActionButton( |
| 71 /** @type {!UI.Action }*/ (UI.actionRegistry.action('console.clear')))); | 69 /** @type {!UI.Action }*/ (UI.actionRegistry.action('console.clear')))); |
| 72 toolbar.appendSeparator(); | 70 toolbar.appendSeparator(); |
| 73 toolbar.appendToolbarItem(this._executionContextComboBox); | 71 toolbar.appendToolbarItem(this._consoleContextSelector.toolbarItem()); |
| 74 toolbar.appendSeparator(); | 72 toolbar.appendSeparator(); |
| 75 toolbar.appendToolbarItem(this._filter._textFilterUI); | 73 toolbar.appendToolbarItem(this._filter._textFilterUI); |
| 76 toolbar.appendToolbarItem(this._filter._levelComboBox); | 74 toolbar.appendToolbarItem(this._filter._levelComboBox); |
| 77 toolbar.appendToolbarItem(this._progressToolbarItem); | 75 toolbar.appendToolbarItem(this._progressToolbarItem); |
| 78 toolbar.appendSpacer(); | 76 toolbar.appendSpacer(); |
| 79 toolbar.appendToolbarItem(this._filterStatusText); | 77 toolbar.appendToolbarItem(this._filterStatusText); |
| 80 toolbar.appendSeparator(); | 78 toolbar.appendSeparator(); |
| 81 toolbar.appendToolbarItem(this._showSettingsPaneButton); | 79 toolbar.appendToolbarItem(this._showSettingsPaneButton); |
| 82 | 80 |
| 83 this._preserveLogCheckbox = new UI.ToolbarSettingCheckbox( | 81 this._preserveLogCheckbox = new UI.ToolbarSettingCheckbox( |
| (...skipping 1190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1274 return true; | 1272 return true; |
| 1275 } | 1273 } |
| 1276 return false; | 1274 return false; |
| 1277 } | 1275 } |
| 1278 }; | 1276 }; |
| 1279 | 1277 |
| 1280 /** | 1278 /** |
| 1281 * @typedef {{messageIndex: number, matchIndex: number}} | 1279 * @typedef {{messageIndex: number, matchIndex: number}} |
| 1282 */ | 1280 */ |
| 1283 Console.ConsoleView.RegexMatchRange; | 1281 Console.ConsoleView.RegexMatchRange; |
| OLD | NEW |