Files app: fixed infinite Google Drive loading spinner

chrome/browser/resources/file_manager/js/directory_model.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.
 
 // If directory files changes too often, don't rescan directory more than once
 // per specified interval
 var SIMULTANEOUS_RESCAN_INTERVAL = 1000;
 // Used for operations that require almost instant rescan.
 var SHORT_RESCAN_INTERVAL = 100;
 
@@ skipping 58 matching lines @@
  * DirectoryModel extends cr.EventTarget.
  */
 DirectoryModel.prototype.__proto__ = cr.EventTarget.prototype;
 
 /**
  * Fills the root list and starts tracking changes.
  */
 DirectoryModel.prototype.start = function() {
   var volumesChangeHandler = this.onMountChanged_.bind(this);
   this.volumeManager_.addEventListener('change', volumesChangeHandler);
+  this.volumeManager_.addEventListener('gdata-status-changed',
+      this.onGDataStatusChanged_.bind(this));
   this.updateRoots_();
 };
 
 /**
  * @return {cr.ui.ArrayDataModel} Files in the current directory.
  */
 DirectoryModel.prototype.getFileList = function() {
   return this.currentFileListContext_.fileList;
 };
 
@@ skipping 987 matching lines @@
 
 /**
  * @private
  */
 DirectoryModel.prototype.updateRootsListSelection_ = function() {
   var rootPath = this.getCurrentRootPath();
   this.rootsListSelection_.selectedIndex = this.findRootsListIndex(rootPath);
 };
 
 /**
- * @return {boolean} True if GDATA if fully mounted.
+ * @return {boolean} True if GDATA is fully mounted.
  * @private
  */
 DirectoryModel.prototype.isGDataMounted_ = function() {
   return this.volumeManager_.getGDataStatus() ==
       VolumeManager.GDataStatus.MOUNTED;
 };
 
 /**
- * Handler for the VolumeManager's event.
+ * Handler for the VolumeManager's 'change' event.
  * @private
  */
 DirectoryModel.prototype.onMountChanged_ = function() {
   this.updateRoots_();
 
   var rootType = this.getCurrentRootType();
 
   if ((rootType == RootType.ARCHIVE || rootType == RootType.REMOVABLE) &&
       !this.volumeManager_.isMounted(this.getCurrentRootPath())) {
     this.changeDirectory(this.getDefaultDirectory());
   }
+};
 
-  if (rootType != RootType.GDATA)

[SeRya, 2012/10/19 11:00:25]

The removed condition was essential. You mustn't do all that stuffs if current
directory is non-gdata.

[Vladislav Kaznacheev, 2012/10/19 13:48:40]

Done.

-    return;
-
+/**
+ * Handler for the VolumeManager's 'gdata-status-changed' event.
+ * @private
+ */
+DirectoryModel.prototype.onGDataStatusChanged_ = function() {
   var mounted = this.isGDataMounted_();
   if (this.getCurrentDirEntry() == DirectoryModel.fakeGDataEntry_) {
     if (mounted) {
       // Change fake entry to real one and rescan.
       function onGotDirectory(entry) {
         if (this.getCurrentDirEntry() == DirectoryModel.fakeGDataEntry_) {
           this.changeDirectoryEntrySilent_(entry);
         }
       }
       this.root_.getDirectory(RootDirectory.GDATA, {},
@@ skipping 247 matching lines @@
         }.bind(this));
   }
 };
 
 /**
  * @return {DirectoryEntry} Current watched directory entry.
  */
 FileWatcher.prototype.getWatchedDirectoryEntry = function() {
   return this.watchedDirectoryEntry_;
 };