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 e0e0dc423a7c5a17efe5114c5b8ad2f7c4836176..56aca9690a7e8cd04407031f3df5c1835f402de5 100644 |
--- a/chrome/browser/resources/file_manager/js/directory_model.js |
+++ b/chrome/browser/resources/file_manager/js/directory_model.js |
@@ -1132,8 +1132,8 @@ DirectoryModel.isSystemDirectory = function(path) { |
* TODO(olege): Change callbacks to events. |
*/ |
DirectoryModel.prototype.search = function(query, |
- onSearchRescan, |
- onClearSearch) { |
+ onSearchRescan, |
+ onClearSearch) { |
query = query.trimLeft(); |
var newDirContents; |
@@ -1149,13 +1149,13 @@ DirectoryModel.prototype.search = function(query, |
} |
// If we already have event listener for an old search, we have to remove it. |
- if (this.onSearchRescan_) |
- this.removeEventListener('rescan-completed', this.onSearchRescan_); |
+ if (this.onSearchCompleted_) |
+ this.removeEventListener('scan-completed', this.onSearchCompleted_); |
- this.onSearchRescan_ = onSearchRescan; |
+ this.onSearchCompleted_ = onSearchRescan; |
this.onClearSearch_ = onClearSearch; |
- this.addEventListener('rescan-completed', this.onSearchRescan_); |
+ this.addEventListener('scan-completed', this.onSearchCompleted_); |
// If we are offline, let's fallback to file name search inside dir. |
if (this.getCurrentRootType() === RootType.GDATA && !this.isOffline()) { |
@@ -1178,9 +1178,9 @@ DirectoryModel.prototype.clearSearch_ = function() { |
if (!this.isSearching()) |
return; |
- if (this.onSearchRescan_) { |
- this.removeEventListener('rescan-completed', this.onSearchRescan_); |
- this.onSearchRescan_ = null; |
+ if (this.onSearchCompleted_) { |
+ this.removeEventListener('scan-completed', this.onSearchCompleted_); |
+ this.onSearchCompleted_ = null; |
} |
if (this.onClearSearch_) { |