Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Unified Diff: chrome/browser/resources/file_manager/js/directory_model.js

Issue 10634020: [FileManager] Do drive search incrementally (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/file_manager/js/directory_model.js
diff --git a/chrome/browser/resources/file_manager/js/directory_model.js b/chrome/browser/resources/file_manager/js/directory_model.js
index 2f4c8495f5174bfcf0881c927431bdfc56f65106..48524eed358112e7c40637000be37e509599354c 100644
--- a/chrome/browser/resources/file_manager/js/directory_model.js
+++ b/chrome/browser/resources/file_manager/js/directory_model.js
@@ -1169,6 +1169,10 @@ DirectoryModel.prototype.search = function(query,
if (this.onSearchCompleted_)
this.removeEventListener('scan-completed', this.onSearchCompleted_);
+ // Current search will be cancelled.
+ if (this.onClearSearch_)
+ this.onClearSearch_();
+
this.onSearchCompleted_ = onSearchRescan;
this.onClearSearch_ = onClearSearch;
« no previous file with comments | « chrome/browser/resources/file_manager/js/directory_contents.js ('k') | chrome/common/extensions/api/file_browser_private.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698