Preventing files from being resorted after load.

chrome/browser/resources/file_manager/js/file_manager.js

 // Copyright (c) 2011 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.
 
 // Setting the src of an img to an empty string can crash the browser, so we
 // use an empty 1x1 gif instead.
 const EMPTY_IMAGE_URI = 'data:image/gif;base64,'
         + 'R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw%3D%3D';
 
 var g_slideshow_data = null;
@@ skipping 1466 matching lines @@
     this.dialogDom_.querySelector('.dialog-title').textContent = dialogTitle;
   };
 
   /**
    * Cache necessary data before a sort happens.
    *
    * This is called by the table code before a sort happens, so that we can
    * go fetch data for the sort field that we may not have yet.
    */
   FileManager.prototype.prepareSort_ = function(field, callback) {
+    this.prepareSortEntries_(this.dataModel_.slice(), field, callback);
+  };
+
+  FileManager.prototype.prepareSortEntries_ = function(entries, field,
+                                                       callback) {
     var cacheFunction;
 
     if (field == 'name' || field == 'cachedMtime_') {

[dgozman, 2011/12/02 09:33:41]

We do not have two files with the same name. Let's do not fetch Mtime.

[SeRya, 2011/12/02 12:32:22]

I'm not sure it need to be fixed. At least not in this CL.

       // Mtime is the tie-breaker for a name sort, so we need to resolve
       // it for both mtime and name sorts.
       cacheFunction = cacheEntryDate;
     } else if (field == 'cachedSize_') {
       cacheFunction = cacheEntrySize;
     } else if (field == 'type') {
       cacheFunction = this.cacheEntryFileType.bind(this);
     } else if (field == 'cachedIconType_') {
       cacheFunction = this.cacheEntryIconType.bind(this);
     } else {
       setTimeout(callback, 0);
       return;
     }
 
     function checkCount() {
       if (uncachedCount == 0) {
         // Callback via a setTimeout so the sync/async semantics don't change
         // based on whether or not the value is cached.
         setTimeout(callback, 0);
       }
     }
 
-    var dataModel = this.dataModel_;
-    var uncachedCount = dataModel.length;
+    var uncachedCount = entries.length;
 
     for (var i = uncachedCount - 1; i >= 0 ; i--) {
-      var entry = dataModel.item(i);
+      var entry = entries[i];
       if (field in entry) {
         uncachedCount--;
       } else {
         cacheFunction(entry, function() {
           uncachedCount--;
           checkCount();
         });
       }
     }
 
@@ skipping 1682 matching lines @@
 
         // Hide files that start with a dot ('.').
         // TODO(rginda): User should be able to override this. Support for other
         // commonly hidden patterns might be nice too.
         if (self.filterFiles_) {
           spliceArgs = spliceArgs.filter(function(e) {
               return e.name.substr(0, 1) != '.';
             });
         }
 
-        spliceArgs.unshift(0, 0);  // index, deleteCount
-        self.dataModel_.splice.apply(self.dataModel_, spliceArgs);
+        self.prefetchCacheForSorting_(entries, function() {

[dgozman, 2011/12/02 09:33:41]

entries -> spliceArgs

[SeRya, 2011/12/02 12:32:22]

Done.

+          spliceArgs.unshift(0, 0);  // index, deleteCount
+          self.dataModel_.splice.apply(self.dataModel_, spliceArgs);
 
-        // Keep reading until entries.length is 0.
-        reader.readEntries(onReadSome, onError);
+          // Keep reading until entries.length is 0.
+          reader.readEntries(onReadSome, onError);
+        });
       };
 
       metrics.startInterval('DirectoryScan');
 
       // If not the root directory, just read the contents.
       reader = this.currentDirEntry_.createReader();
       reader.readEntries(onReadSome, onError);
       return;
     }
 
     // Otherwise, use the provided list of root subdirectories, since the
     // real local filesystem root directory (the one we use outside the
     // harness) can't be enumerated yet.
     var spliceArgs = [].slice.call(this.rootEntries_);
     spliceArgs.unshift(0, 0);  // index, deleteCount
     this.dataModel_.splice.apply(this.dataModel_, spliceArgs);
 
     if (opt_callback)
       opt_callback();
   };
 
+  FileManager.prototype.prefetchCacheForSorting_ = function(entries, callback) {
+    var field = this.dataModel_.sortStatus.field;
+    if (field) {
+      this.prepareSortEntries_(entries, field, callback);
+    } else {
+      callback();
+      return;
+    }
+  };
+
   FileManager.prototype.findListItem_ = function(event) {
     var node = event.srcElement;
     while (node) {
       if (node.tagName == 'LI')
         break;
       node = node.parentNode;
     }
 
     return node;
   };
@@ skipping 705 matching lines @@
           });
       }, onError);
 
       function onError(err) {
         console.log('Error while checking free space: ' + err);
         setTimeout(doCheck, 1000 * 60);
       }
     }
   }
 })();