DevTools: Unify filtering UI

Source/devtools/front_end/SearchController.js

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
  * Copyright (C) 2009 Joseph Pecoraro
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
@@ skipping 36 matching lines @@
     this._searchControlElement = searchControlElementColumn.createChild("span", "toolbar-search-control");
     this._searchInputElement = this._searchControlElement.createChild("input", "search-replace");
     this._searchInputElement.id = "search-input-field";
 
     this._suggestBox = new WebInspector.SuggestBox(this, searchControlElementColumn);
 
     this._matchesElement = this._searchControlElement.createChild("label", "search-results-matches");
     this._matchesElement.setAttribute("for", "search-input-field");
 
     this._searchNavigationElement = this._searchControlElement.createChild("div", "toolbar-search-navigation-controls");
-    this._toggleFilterUI(false);
 
     this._searchNavigationPrevElement = this._searchNavigationElement.createChild("div", "toolbar-search-navigation toolbar-search-navigation-prev");
     this._searchNavigationPrevElement.addEventListener("click", this._onPrevButtonSearch.bind(this), false);
     this._searchNavigationPrevElement.title = WebInspector.UIString("Search Previous");
 
     this._searchNavigationNextElement = this._searchNavigationElement.createChild("div", "toolbar-search-navigation toolbar-search-navigation-next");
     this._searchNavigationNextElement.addEventListener("click", this._onNextButtonSearch.bind(this), false);
     this._searchNavigationNextElement.title = WebInspector.UIString("Search Next");
 
     this._searchInputElement.addEventListener("mousedown", this._onSearchFieldManualFocus.bind(this), false); // when the search field is manually selected
@@ skipping 32 matching lines @@
 
     this._replaceCheckboxElement = this._replaceElement.createChild("input");
     this._replaceCheckboxElement.type = "checkbox";
     this._replaceCheckboxElement.id = "search-replace-trigger";
     this._replaceCheckboxElement.addEventListener("click", this._updateSecondRowVisibility.bind(this), false);
 
     this._replaceLabelElement = this._replaceElement.createChild("label");
     this._replaceLabelElement.textContent = WebInspector.UIString("Replace");
     this._replaceLabelElement.setAttribute("for", "search-replace-trigger");
 
-    // Column 5
-    this._filterCheckboxContainer = this._firstRowElement.createChild("td").createChild("label");
-    this._filterCheckboxContainer.setAttribute("for", "filter-trigger");
-
-    this._filterCheckboxElement = this._filterCheckboxContainer.createChild("input");
-    this._filterCheckboxElement.type = "checkbox";
-    this._filterCheckboxElement.id = "filter-trigger";
-    this._filterCheckboxElement.addEventListener("click", this._filterCheckboxClick.bind(this), false);
-
-    this._filterCheckboxContainer.createTextChild(WebInspector.UIString("Filter"));
-
     // Column 6
     var cancelButtonElement = this._firstRowElement.createChild("td").createChild("button");
     cancelButtonElement.textContent = WebInspector.UIString("Cancel");
     cancelButtonElement.tabIndex = -1;
     cancelButtonElement.addEventListener("click", this.closeSearch.bind(this), false);
 }
 
 WebInspector.SearchController.prototype = {
     /**
      * @param {number} matches
@@ skipping 25 matching lines @@
     closeSearch: function()
     {
         this.cancelSearch();
         WebInspector.setCurrentFocusElement(WebInspector.previousFocusElement());
     },
 
     cancelSearch: function()
     {
         if (!this._searchIsVisible)
             return;
-        if (this._filterCheckboxElement.checked) {
-            this._filterCheckboxElement.checked = false;
-            this._toggleFilterUI(false);
-            this.resetFilter();
-        } else
-            this.resetSearch();
+        this.resetSearch();
         delete this._searchIsVisible;
         this._searchHost.setFooterElement(null);
         this.resetSearch();
         delete this._searchHost;
         delete this._searchProvider;
     },
 
     resetSearch: function()
     {
         this._suggestBox.hide();
@@ skipping 87 matching lines @@
         // FIXME: fix this mess.
         if (WebInspector.inspectorView.drawer().element.isAncestor(document.activeElement) && WebInspector.inspectorView.drawer().getSearchProvider())
             this._searchHost = WebInspector.inspectorView.drawer();
         else
             this._searchHost = WebInspector.inspectorView;
 
         this._searchProvider = this._searchHost.getSearchProvider();
         this._searchHost.setFooterElement(this._element);
 
         this._updateReplaceVisibility();
-        this._updateFilterVisibility();
         if (WebInspector.currentFocusElement() !== this._searchInputElement) {
             var selection = window.getSelection();
             if (selection.rangeCount) {
                 var queryCandidate = selection.toString().replace(/\r?\n.*/, "");
                 if (queryCandidate)
                     this._searchInputElement.value = queryCandidate;
             }
         }
         this._performSearch(false, false);
         this._searchInputElement.focus();
         this._searchInputElement.select();
         this._searchIsVisible = true;
     },
 
-    /**
-     * @param {boolean} filter
-     */
-    _toggleFilterUI: function(filter)
-    {
-        this._matchesElement.enableStyleClass("hidden", filter);
-        this._searchNavigationElement.enableStyleClass("hidden", filter);
-        this._searchInputElement.placeholder = filter ? WebInspector.UIString("Filter") : WebInspector.UIString("Find");
-    },
-
-    _updateFilterVisibility: function()
-    {
-        if (this._searchProvider.canFilter())
-            this._filterCheckboxContainer.removeStyleClass("hidden");
-        else
-            this._filterCheckboxContainer.addStyleClass("hidden");
-    },
-
     _updateReplaceVisibility: function()
     {
         if (!this._searchProvider)
             return;
 
         if (this._searchProvider.canSearchAndReplace())
             this._replaceElement.removeStyleClass("hidden");
         else {
             this._replaceElement.addStyleClass("hidden");
             this._replaceCheckboxElement.checked = false;
@@ skipping 127 matching lines @@
         this._searchProvider.replaceSelectionWith(this._replaceInputElement.value);
         delete this._currentQuery;
         this._performSearch(true, true);
     },
 
     _replaceAll: function()
     {
         this._searchProvider.replaceAllWith(this._searchInputElement.value, this._replaceInputElement.value);
     },
 
-    _filterCheckboxClick: function()
-    {
-        this._searchInputElement.focus();
-        this._searchInputElement.select();
-
-        if (this._filterCheckboxElement.checked) {
-            this._toggleFilterUI(true);
-            this.resetSearch();
-            this._performFilter(this._searchInputElement.value);
-        } else {
-            this._toggleFilterUI(false);
-            this.resetFilter();
-            this._performSearch(false, false);
-        }
-    },
-
-    /**
-     * @param {string} query
-     */
-    _performFilter: function(query)
-    {
-        this._searchProvider.performFilter(query);
-    },
 
     _onInput: function(event)
     {
         this._onValueChanged();
     },
 
     _onValueChanged: function()
     {
         var suggestions = this._searchProvider.buildSuggestions(this._searchInputElement);
         if (suggestions && suggestions.length)
             this._suggestBox.updateSuggestions(null, suggestions, 0, true, "");
         else
             this._suggestBox.hide();
-
-        if (this._filterCheckboxElement.checked)
-            this._performFilter(this._searchInputElement.value);
-        else
-            this._performSearch(false, true);
+        this._performSearch(false, true);
     },
 
     /**
      * @override
      * @param {string} suggestion
      * @param {boolean=} isIntermediateSuggestion
      */
     applySuggestion: function(suggestion, isIntermediateSuggestion)
     {
         if (isIntermediateSuggestion)
             return;
 
         var text = this._searchInputElement.value;
         text = text.substring(0, text.lastIndexOf(" ") + 1) + suggestion;
         this._searchInputElement.value = text;
     },
 
     /** @override */
     acceptSuggestion: function()
     {
         this._searchInputElement.scrollLeft = this._searchInputElement.scrollWidth;
         this._onValueChanged();
-    },
-
-    resetFilter: function()
-    {
-        this._performFilter("");
     }
 }
 
 /**
  * @type {?WebInspector.SearchController}
  */
 WebInspector.searchController = null;
 
 /**
  * @interface
  */
 WebInspector.Searchable = function()
 {
 }
 
 WebInspector.Searchable.prototype = {
     /**
      * @return {boolean}
      */
     canSearchAndReplace: function() { },
 
-    /**
-     * @return {boolean}
-     */
-    canFilter: function() { },
-
     searchCanceled: function() { },
 
     /**
      * @param {string} query
      * @param {boolean} shouldJump
      * @param {WebInspector.Searchable=} self
      */
     performSearch: function(query, shouldJump, self) { },
 
     /**
@@ skipping 10 matching lines @@
      * @param {WebInspector.Searchable=} self
      */
     jumpToPreviousSearchResult: function(self) { },
 
     /**
      * @param {HTMLInputElement} input
      * @return {?Array.<string>}
      */
     buildSuggestions: function(input) { }
 }