Extract ContentScanner from DirectoryContent.

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';
 
 /**
  * FileManager constructor.
  *
  * FileManager objects encapsulate the functionality of the file selector
@@ skipping 2651 matching lines @@
           input.selectionStart = 0;
           input.selectionEnd = selectionEnd;
         }
     }, 0);
   };
 
   /**
    * @private
    */
   FileManager.prototype.onScanStarted_ = function() {
-    if (this.scanInProgress_ && !this.scanUpdatedAtLeastOnceOrCompleted_) {
+    if (this.scanInProgress_) {
       this.table_.list.endBatchUpdates();
       this.grid_.endBatchUpdates();
     }
 
     this.updateCommands();
     this.table_.list.startBatchUpdates();
     this.grid_.startBatchUpdates();
     this.scanInProgress_ = true;
 
     this.scanUpdatedAtLeastOnceOrCompleted_ = false;
@@ skipping 20 matching lines @@
   FileManager.prototype.onScanCompleted_ = function() {
     if (!this.scanInProgress_) {
       console.error('Scan-completed event recieved. But scan is not started.');
       return;
     }
 
     this.updateCommands();
     this.hideSpinnerLater_();
     this.refreshCurrentDirectoryMetadata_();
 
+    if (this.scanUpdatedTimer_) {

[mtomasz, 2013/10/01 02:13:44]

Can you please briefly explain this change? Thanks!

[hidehiko, 2013/10/01 04:12:23]

This patch fixes some weird event firing in DirectoryContents. Along with it, we
should fix the handlers for correct callback implementation.

+      clearTimeout(this.scanUpdatedTimer_);
+      this.scanUpdatedTimer_ = null;
+    }
+
     // To avoid flickering postpone updating the ui by a small amount of time.
     // There is a high chance, that metadata will be received within 50 ms.
     this.scanCompletedTimer_ = setTimeout(function() {
       // Check if batch updates are already finished by onScanUpdated_().
-      if (this.scanUpdatedAtLeastOnceOrCompleted_)
-        return;
-      this.scanUpdatedAtLeastOnceOrCompleted_ = true;
+      if (!this.scanUpdatedAtLeastOnceOrCompleted_) {
+        this.scanUpdatedAtLeastOnceOrCompleted_ = true;
+        this.updateMiddleBarVisibility_();
+      }
+
       this.scanInProgress_ = false;
-      if (this.scanUpdatedTimer_) {
-        clearTimeout(this.scanUpdatedTimer_);
-        this.scanUpdatedTimer_ = null;
-      }
       this.table_.list.endBatchUpdates();
       this.grid_.endBatchUpdates();
-      this.updateMiddleBarVisibility_();
       this.scanCompletedTimer_ = null;
     }.bind(this), 50);
   };
 
   /**
    * @private
    */
   FileManager.prototype.onScanUpdated_ = function() {
     if (!this.scanInProgress_) {
       console.error('Scan-updated event recieved. But scan is not started.');
       return;
     }
 
-    // We need to hide the spinner only once.
-    if (this.scanUpdatedAtLeastOnceOrCompleted_ || this.scanUpdatedTimer_)
+    if (this.scanUpdatedTimer_ || this.scanCompletedTimer_)
       return;
 
     // Show contents incrementally by finishing batch updated, but only after
     // 200ms elapsed, to avoid flickering when it is not necessary.
     this.scanUpdatedTimer_ = setTimeout(function() {
       // We need to hide the spinner only once.
-      if (this.scanUpdatedAtLeastOnceOrCompleted_)
-        return;
-      if (this.scanCompletedTimer_) {
-        clearTimeout(this.scanCompletedTimer_);
-        this.scanCompletedTimer_ = null;
+      if (!this.scanUpdatedAtLeastOnceOrCompleted_) {
+        this.scanUpdatedAtLeastOnceOrCompleted_ = true;
+        this.hideSpinnerLater_();
+        this.updateMiddleBarVisibility_();
       }
-      this.scanUpdatedAtLeastOnceOrCompleted_ = true;
-      this.scanInProgress_ = false;
-      this.hideSpinnerLater_();
-      this.table_.list.endBatchUpdates();
-      this.grid_.endBatchUpdates();
-      this.updateMiddleBarVisibility_();
+
+      // Update the UI.
+      if (this.scanInProgress_) {
+        this.table_.list.endBatchUpdates();
+        this.grid_.endBatchUpdates();
+        this.table_.list.startBatchUpdates();
+        this.grid_.startBatchUpdates();
+      }
       this.scanUpdatedTimer_ = null;
     }.bind(this), 200);
   };
 
   /**
    * @private
    */
   FileManager.prototype.onScanCancelled_ = function() {
     if (!this.scanInProgress_) {
       console.error('Scan-cancelled event recieved. But scan is not started.');
       return;
     }
 
     this.updateCommands();
     this.hideSpinnerLater_();
     if (this.scanCompletedTimer_) {
       clearTimeout(this.scanCompletedTimer_);
       this.scanCompletedTimer_ = null;
     }
     if (this.scanUpdatedTimer_) {
       clearTimeout(this.scanUpdatedTimer_);
       this.scanUpdatedTimer_ = null;
     }
     // Finish unfinished batch updates.
     if (!this.scanUpdatedAtLeastOnceOrCompleted_) {
       this.scanUpdatedAtLeastOnceOrCompleted_ = true;
+      this.updateMiddleBarVisibility_();
+    }
+    if (this.scanInProgress_) {

[mtomasz, 2013/10/01 02:25:23]

This will always return true because of #2771, so we can remove.

[hidehiko, 2013/10/01 04:12:23]

Done.

       this.scanInProgress_ = false;
       this.table_.list.endBatchUpdates();
       this.grid_.endBatchUpdates();
-      this.updateMiddleBarVisibility_();
     }
   };
 
   /**
    * @private
    */
   FileManager.prototype.cancelSpinnerTimeout_ = function() {
     if (this.showSpinnerTimeout_) {
       clearTimeout(this.showSpinnerTimeout_);
       this.showSpinnerTimeout_ = null;
@@ skipping 1083 matching lines @@
    */
   FileManager.prototype.setCtrlKeyPressed_ = function(flag) {
     this.ctrlKeyPressed_ = flag;
     // Before the DOM is constructed, the key event can be handled.
     var cacheClearCommand =
         this.document_.querySelector('#drive-clear-local-cache');
     if (cacheClearCommand)
       cacheClearCommand.canExecuteChange();
   };
 })();