In FileManager send 'on-completed' event only when a scan is completed. Send 'on-cancelled' event w…

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.
 
 /**
  * FileManager constructor.
  *
  * FileManager objects encapsulate the functionality of the file selector
  * dialogs, as well as the full screen file manager application (though the
  * latter is not yet implemented).
@@ skipping 420 matching lines @@
     var self = this;
     dm.addEventListener('begin-update-files', function() {
       self.currentList_.startBatchUpdates();
     });
     dm.addEventListener('end-update-files', function() {
       self.restoreItemBeingRenamed_();
       self.currentList_.endBatchUpdates();
     });
     dm.addEventListener('scan-started', this.showSpinnerLater_.bind(this));
     dm.addEventListener('scan-completed', this.showSpinner_.bind(this, false));
+    dm.addEventListener('scan-cancelled', this.hideSpinnerLater_.bind(this));
     dm.addEventListener('scan-completed',
                         this.refreshCurrentDirectoryMetadata_.bind(this));
     dm.addEventListener('rescan-completed',
                         this.refreshCurrentDirectoryMetadata_.bind(this));
     this.addEventListener('selection-summarized',
                           this.onSelectionSummarized_.bind(this));
 
     this.summarizeSelection_();
 
     this.setupCurrentDirectory_(true /* page loading */);
@@ skipping 2777 matching lines @@
       this.showSpinnerTimeout_ = null;
     }
   };
 
   FileManager.prototype.showSpinnerLater_ = function() {
     this.cancelSpinnerTimeout_();
     this.showSpinnerTimeout_ =
         setTimeout(this.showSpinner_.bind(this, true), 500);
   };
 
+  FileManager.prototype.hideSpinnerLater_ = function() {
+    setTimeout(this.showSpinner_.bind(this, false), 100);
+  };
+
   FileManager.prototype.showSpinner_ = function(on) {
-    this.cancelSpinnerTimeout_();
-    if (on) {
+    if (on && this.directoryModel_ && this.directoryModel_.isScanning()) {
       if (this.directoryModel_.isSearching()) {
         this.dialogContainer_.classList.add('searching');
+        this.spinner_.style.display = 'none';
       } else {
         this.spinner_.style.display = '';
+        this.dialogContainer_.classList.remove('searching');
       }
-    } else {
+    }
+
+    if (!on && (!this.directoryModel_ || !this.directoryModel_.isScanning())) {
       this.spinner_.style.display = 'none';
       if (this.dialogContainer_)
         this.dialogContainer_.classList.remove('searching');
     }
   };
 
   FileManager.prototype.onNewFolderCommand_ = function(event) {
     var defaultName = str('DEFAULT_NEW_FOLDER_NAME');
 
     // Find a name that doesn't exist in the data model.
@@ skipping 923 matching lines @@
     }
 
     var defaultActionSeparator =
         this.dialogDom_.querySelector('#default-action-separator');
 
     this.defaultActionMenuItem_.hidden = !taskItem;
     defaultActionSeparator.hidden = !taskItem;
   }
 })();