| 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 767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 778 WebInspector.settings.messageLevelFilters.addChangeListener(this._updateLeve
lFilter.bind(this)); | 778 WebInspector.settings.messageLevelFilters.addChangeListener(this._updateLeve
lFilter.bind(this)); |
| 779 }; | 779 }; |
| 780 | 780 |
| 781 WebInspector.ConsoleViewFilter.Events = { | 781 WebInspector.ConsoleViewFilter.Events = { |
| 782 FilterChanged: "FilterChanged" | 782 FilterChanged: "FilterChanged" |
| 783 }; | 783 }; |
| 784 | 784 |
| 785 WebInspector.ConsoleViewFilter.prototype = { | 785 WebInspector.ConsoleViewFilter.prototype = { |
| 786 addFilters: function(filterBar) | 786 addFilters: function(filterBar) |
| 787 { | 787 { |
| 788 this._textFilterUI = new WebInspector.TextFilterUI(); | 788 this._textFilterUI = new WebInspector.TextFilterUI(true); |
| 789 this._textFilterUI.addEventListener(WebInspector.FilterUI.Events.FilterC
hanged, this._textFilterChanged, this); | 789 this._textFilterUI.addEventListener(WebInspector.FilterUI.Events.FilterC
hanged, this._textFilterChanged, this); |
| 790 filterBar.addFilter(this._textFilterUI); | 790 filterBar.addFilter(this._textFilterUI); |
| 791 | 791 |
| 792 this._levelFilterUI = new WebInspector.NamedBitSetFilterUI(); | 792 this._levelFilterUI = new WebInspector.NamedBitSetFilterUI(); |
| 793 this._levelFilterUI.addBit("error", WebInspector.UIString("Errors")); | 793 this._levelFilterUI.addBit("error", WebInspector.UIString("Errors")); |
| 794 this._levelFilterUI.addBit("warning", WebInspector.UIString("Warnings"))
; | 794 this._levelFilterUI.addBit("warning", WebInspector.UIString("Warnings"))
; |
| 795 this._levelFilterUI.addBit("info", WebInspector.UIString("Info")); | 795 this._levelFilterUI.addBit("info", WebInspector.UIString("Info")); |
| 796 this._levelFilterUI.addBit("log", WebInspector.UIString("Logs")); | 796 this._levelFilterUI.addBit("log", WebInspector.UIString("Logs")); |
| 797 this._levelFilterUI.addBit("debug", WebInspector.UIString("Debug")); | 797 this._levelFilterUI.addBit("debug", WebInspector.UIString("Debug")); |
| 798 this._levelFilterUI.addEventListener(WebInspector.FilterUI.Events.Filter
Changed, this._levelFilterChanged, this); | 798 this._levelFilterUI.addEventListener(WebInspector.FilterUI.Events.Filter
Changed, this._levelFilterChanged, this); |
| 799 filterBar.addFilter(this._levelFilterUI); | 799 filterBar.addFilter(this._levelFilterUI); |
| 800 this._updateLevelFilter(); | 800 this._updateLevelFilter(); |
| 801 }, | 801 }, |
| 802 | 802 |
| 803 _textFilterChanged: function(event) | 803 _textFilterChanged: function(event) |
| 804 { | 804 { |
| 805 var query = this._textFilterUI.value(); | 805 this._filterRegex = this._textFilterUI.regex(); |
| 806 if (!query) | |
| 807 delete this._filterRegex; | |
| 808 else | |
| 809 this._filterRegex = createPlainTextSearchRegex(query, "gi"); | |
| 810 | 806 |
| 811 this._filterChanged(); | 807 this._filterChanged(); |
| 812 }, | 808 }, |
| 813 | 809 |
| 814 _levelFilterChanged: function(event) | 810 _levelFilterChanged: function(event) |
| 815 { | 811 { |
| 816 if (this._updatingLevelFilter) | 812 if (this._updatingLevelFilter) |
| 817 return; | 813 return; |
| 818 var filteredOutTypes = this._levelFilterUI.filteredOutTypes(); | 814 var filteredOutTypes = this._levelFilterUI.filteredOutTypes(); |
| 819 this._messageLevelFilters = {}; | 815 this._messageLevelFilters = {}; |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 883 }, | 879 }, |
| 884 | 880 |
| 885 reset: function() | 881 reset: function() |
| 886 { | 882 { |
| 887 this._hideCSSErrorsInConsole = false; | 883 this._hideCSSErrorsInConsole = false; |
| 888 WebInspector.settings.hideCSSErrorsInConsole.set(this._hideCSSErrorsInCo
nsole); | 884 WebInspector.settings.hideCSSErrorsInConsole.set(this._hideCSSErrorsInCo
nsole); |
| 889 this._messageURLFilters = {}; | 885 this._messageURLFilters = {}; |
| 890 WebInspector.settings.messageURLFilters.set(this._messageURLFilters); | 886 WebInspector.settings.messageURLFilters.set(this._messageURLFilters); |
| 891 this._messageLevelFilters = {}; | 887 this._messageLevelFilters = {}; |
| 892 WebInspector.settings.messageLevelFilters.set(this._messageLevelFilters)
; | 888 WebInspector.settings.messageLevelFilters.set(this._messageLevelFilters)
; |
| 893 this._filterChanged(); | 889 this._textFilterUI.setValue(""); // Would fire FilterChanged event to up
date visible messages. |
| 894 }, | 890 }, |
| 895 | 891 |
| 896 /** | 892 /** |
| 897 * @private | 893 * @private |
| 898 */ | 894 */ |
| 899 _updateLevelFilter: function() | 895 _updateLevelFilter: function() |
| 900 { | 896 { |
| 901 this._updatingLevelFilter = true; | 897 this._updatingLevelFilter = true; |
| 902 var filteredOutTypes = Object.keys(this._messageLevelFilters); | 898 var filteredOutTypes = Object.keys(this._messageLevelFilters); |
| 903 this._levelFilterUI.setFilteredOutTypes(filteredOutTypes); | 899 this._levelFilterUI.setFilteredOutTypes(filteredOutTypes); |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1101 | 1097 |
| 1102 /** | 1098 /** |
| 1103 * @type {?WebInspector.ConsoleView} | 1099 * @type {?WebInspector.ConsoleView} |
| 1104 */ | 1100 */ |
| 1105 WebInspector.consoleView = null; | 1101 WebInspector.consoleView = null; |
| 1106 | 1102 |
| 1107 WebInspector.ConsoleMessage.create = function(source, level, message, type, url,
line, column, repeatCount, parameters, stackTrace, requestId, isOutdated) | 1103 WebInspector.ConsoleMessage.create = function(source, level, message, type, url,
line, column, repeatCount, parameters, stackTrace, requestId, isOutdated) |
| 1108 { | 1104 { |
| 1109 return new WebInspector.ConsoleMessageImpl(source, level, message, WebInspec
tor.consoleView._linkifier, type, url, line, column, repeatCount, parameters, st
ackTrace, requestId, isOutdated); | 1105 return new WebInspector.ConsoleMessageImpl(source, level, message, WebInspec
tor.consoleView._linkifier, type, url, line, column, repeatCount, parameters, st
ackTrace, requestId, isOutdated); |
| 1110 } | 1106 } |
| OLD | NEW |