Files.app: Separate the last search query from "lastQuery"

chrome/browser/resources/file_manager/js/file_manager.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 'use strict';
 
 /**
  * This variable is checked in SelectFileDialogExtensionBrowserTest.
  * @type {number}
  */
@@ skipping 761 matching lines @@
         'resize', this.onResize_.bind(this));
 
     if (loadTimeData.getBoolean('ASH'))
       this.dialogDom_.setAttribute('ash', 'true');
 
     this.filePopup_ = null;
 
     this.searchBox_ = this.dialogDom_.querySelector('#search-box');
     this.searchBox_.addEventListener(
         'input', this.onSearchBoxUpdate_.bind(this));
+    this.lastSearchQuery_ = '';
 
     var autocompleteList = new cr.ui.AutocompleteList();
     autocompleteList.id = 'autocomplete-list';
     autocompleteList.autoExpands = true;
     autocompleteList.requestSuggestions =
         this.requestAutocompleteSuggestions_.bind(this);
     // function(item) {}.bind(this) does not work here, as it's a constructor.
     var self = this;
     autocompleteList.itemConstructor = function(item) {
       return self.createAutocompleteListItem_(item);
@@ skipping 2256 matching lines @@
    * @private
    */
   FileManager.prototype.onSearchBoxUpdate_ = function(event) {
     var searchString = this.searchBox_.value;
 
     if (this.isOnDrive()) {
       // When the search text is changed, finishes the search and showes back
       // the last directory by passing an empty string to
       // {@code DirectoryModel.search()}.
       if (this.directoryModel_.isSearching() &&
-          this.lastQuery_ != searchString) {
-        this.directoryModel_.search('', function() {}, function() {});
+          this.lastSearchQuery_ != searchString) {
+        this.doSearch('');
       }
 
       // On drive, incremental search is not invoked since we have an auto-
       // complete suggestion instead.
       return;
     }
 
     this.search_(searchString);
   };
 
@@ skipping 16 matching lines @@
         noResultsDiv.setAttribute('show', 'true');
       } else {
         noResultsDiv.removeAttribute('show');
       }
     };
 
     var hideNoResultsDiv = function() {
       noResultsDiv.removeAttribute('show');
     };
 
-    this.directoryModel_.search(searchString,
-                                reportEmptySearchResults.bind(this),
-                                hideNoResultsDiv.bind(this));
+    this.doSearch(searchString,
+                  reportEmptySearchResults.bind(this),
+                  hideNoResultsDiv.bind(this));
   };
 
   /**
+   * Performs search and displays results.
+   *
+   * @param {string} query Query that will be searched for.
+   * @param {function()=} opt_onSearchRescan Function that will be called when
+   *     the search directory is rescanned (i.e. search results are displayed).
+   * @param {function()=} opt_onClearSearch Function to be called when search
+   *     state gets cleared.
+   */
+  FileManager.prototype.doSearch = function(
+      searchString, opt_onSearchRescan, opt_onClearSearch) {
+    var onSearchRescan = opt_onSearchRescan || function() {};
+    var onClearSearch = opt_onClearSearch || function() {};
+
+    this.lastSearchQuery_ = searchString;
+    this.directoryModel_.search(searchString, onSearchRescan, onClearSearch);
+  };
+
+  /**
    * Requests autocomplete suggestions for files on Drive.
    * Once the suggestions are returned, the autocomplete popup will show up.
    *
    * @param {string} query The text to autocomplete from.
    * @private
    */
   FileManager.prototype.requestAutocompleteSuggestions_ = function(query) {
     if (!this.isOnDrive())
       return;
 
@@ skipping 291 matching lines @@
       callback(this.preferences_);
       return;
     }
 
     chrome.fileBrowserPrivate.getPreferences(function(prefs) {
       this.preferences_ = prefs;
       callback(prefs);
     }.bind(this));
   };
 })();