| 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 this._clearConsoleButton = new WebInspector.ToolbarButton(WebInspector.UIStr
ing("Clear console log."), "clear-toolbar-item"); | 61 this._clearConsoleButton = new WebInspector.ToolbarButton(WebInspector.UIStr
ing("Clear console log."), "clear-toolbar-item"); |
| 62 this._clearConsoleButton.addEventListener("click", this._requestClearMessage
s, this); | 62 this._clearConsoleButton.addEventListener("click", this._requestClearMessage
s, this); |
| 63 | 63 |
| 64 this._executionContextComboBox = new WebInspector.ToolbarComboBox(null, "con
sole-context"); | 64 this._executionContextComboBox = new WebInspector.ToolbarComboBox(null, "con
sole-context"); |
| 65 this._executionContextComboBox.setMaxWidth(200); | 65 this._executionContextComboBox.setMaxWidth(200); |
| 66 this._executionContextModel = new WebInspector.ExecutionContextModel(this._e
xecutionContextComboBox.selectElement()); | 66 this._executionContextModel = new WebInspector.ExecutionContextModel(this._e
xecutionContextComboBox.selectElement()); |
| 67 | 67 |
| 68 this._filter = new WebInspector.ConsoleViewFilter(this); | 68 this._filter = new WebInspector.ConsoleViewFilter(this); |
| 69 this._filter.addEventListener(WebInspector.ConsoleViewFilter.Events.FilterCh
anged, this._updateMessageList.bind(this)); | 69 this._filter.addEventListener(WebInspector.ConsoleViewFilter.Events.FilterCh
anged, this._updateMessageList.bind(this)); |
| 70 | 70 |
| 71 this._filterBar = new WebInspector.FilterBar(); | 71 this._filterBar = new WebInspector.FilterBar("consoleView"); |
| 72 | 72 |
| 73 this._preserveLogCheckbox = new WebInspector.ToolbarCheckbox(WebInspector.UI
String("Preserve log"), WebInspector.UIString("Do not clear log on page reload /
navigation."), WebInspector.moduleSetting("preserveConsoleLog")); | 73 this._preserveLogCheckbox = new WebInspector.ToolbarCheckbox(WebInspector.UI
String("Preserve log"), WebInspector.UIString("Do not clear log on page reload /
navigation."), WebInspector.moduleSetting("preserveConsoleLog")); |
| 74 this._progressToolbarItem = new WebInspector.ToolbarItem(createElement("div"
)); | 74 this._progressToolbarItem = new WebInspector.ToolbarItem(createElement("div"
)); |
| 75 | 75 |
| 76 var toolbar = new WebInspector.Toolbar(this._contentsElement); | 76 var toolbar = new WebInspector.Toolbar(this._contentsElement); |
| 77 toolbar.appendToolbarItem(this._clearConsoleButton); | 77 toolbar.appendToolbarItem(this._clearConsoleButton); |
| 78 toolbar.appendToolbarItem(this._filterBar.filterButton()); | 78 toolbar.appendToolbarItem(this._filterBar.filterButton()); |
| 79 toolbar.appendToolbarItem(this._executionContextComboBox); | 79 toolbar.appendToolbarItem(this._executionContextComboBox); |
| 80 toolbar.appendToolbarItem(this._preserveLogCheckbox); | 80 toolbar.appendToolbarItem(this._preserveLogCheckbox); |
| 81 toolbar.appendToolbarItem(this._progressToolbarItem); | 81 toolbar.appendToolbarItem(this._progressToolbarItem); |
| 82 | 82 |
| 83 this._filtersContainer = this._contentsElement.createChild("div", "console-f
ilters-header hidden"); | 83 this._contentsElement.appendChild(this._filterBar.filtersElement()); |
| 84 this._filtersContainer.appendChild(this._filterBar.filtersElement()); | |
| 85 this._filterBar.addEventListener(WebInspector.FilterBar.Events.FiltersToggle
d, this._onFiltersToggled, this); | |
| 86 this._filterBar.setName("consoleView"); | |
| 87 this._filter.addFilters(this._filterBar); | 84 this._filter.addFilters(this._filterBar); |
| 88 | 85 |
| 89 this._viewport = new WebInspector.ViewportControl(this); | 86 this._viewport = new WebInspector.ViewportControl(this); |
| 90 this._viewport.setStickToBottom(true); | 87 this._viewport.setStickToBottom(true); |
| 91 this._viewport.contentElement().classList.add("console-group", "console-grou
p-messages"); | 88 this._viewport.contentElement().classList.add("console-group", "console-grou
p-messages"); |
| 92 this._contentsElement.appendChild(this._viewport.element); | 89 this._contentsElement.appendChild(this._viewport.element); |
| 93 this._messagesElement = this._viewport.element; | 90 this._messagesElement = this._viewport.element; |
| 94 this._messagesElement.id = "console-messages"; | 91 this._messagesElement.id = "console-messages"; |
| 95 this._messagesElement.classList.add("monospace"); | 92 this._messagesElement.classList.add("monospace"); |
| 96 this._messagesElement.addEventListener("click", this._messagesClicked.bind(t
his), true); | 93 this._messagesElement.addEventListener("click", this._messagesClicked.bind(t
his), true); |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 | 314 |
| 318 /** | 315 /** |
| 319 * @override | 316 * @override |
| 320 * @return {!Element} | 317 * @return {!Element} |
| 321 */ | 318 */ |
| 322 defaultFocusedElement: function() | 319 defaultFocusedElement: function() |
| 323 { | 320 { |
| 324 return this._promptElement; | 321 return this._promptElement; |
| 325 }, | 322 }, |
| 326 | 323 |
| 327 _onFiltersToggled: function(event) | |
| 328 { | |
| 329 var toggled = /** @type {boolean} */ (event.data); | |
| 330 this._filtersContainer.classList.toggle("hidden", !toggled); | |
| 331 }, | |
| 332 | |
| 333 _executionContextChanged: function() | 324 _executionContextChanged: function() |
| 334 { | 325 { |
| 335 this._prompt.clearAutoComplete(true); | 326 this._prompt.clearAutoComplete(true); |
| 336 if (!this._showAllMessagesCheckbox.checked()) | 327 if (!this._showAllMessagesCheckbox.checked()) |
| 337 this._updateMessageList(); | 328 this._updateMessageList(); |
| 338 }, | 329 }, |
| 339 | 330 |
| 340 willHide: function() | 331 willHide: function() |
| 341 { | 332 { |
| 342 this._hidePromptSuggestBox(); | 333 this._hidePromptSuggestBox(); |
| (...skipping 968 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1311 handleAction: function(context, actionId) | 1302 handleAction: function(context, actionId) |
| 1312 { | 1303 { |
| 1313 WebInspector.console.show(); | 1304 WebInspector.console.show(); |
| 1314 } | 1305 } |
| 1315 } | 1306 } |
| 1316 | 1307 |
| 1317 /** | 1308 /** |
| 1318 * @typedef {{messageIndex: number, matchIndex: number}} | 1309 * @typedef {{messageIndex: number, matchIndex: number}} |
| 1319 */ | 1310 */ |
| 1320 WebInspector.ConsoleView.RegexMatchRange; | 1311 WebInspector.ConsoleView.RegexMatchRange; |
| OLD | NEW |