Move sorting logic from table to list.

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.
 
 // WK Bug 55728 is fixed on the chrome 12 branch but not on the trunk.
 // TODO(rginda): Enable this everywhere once we have a trunk-worthy fix.
 const ENABLE_EXIF_READER = navigator.userAgent.match(/chrome\/12\.0/i);
 
 // Thumbnail view is painful without the exif reader.
 const ENABLE_THUMBNAIL_VIEW = ENABLE_EXIF_READER;
@@ skipping 500 matching lines @@
       if (!eval(expr))
         ary[i].style.display = 'none';
     }
 
     // Populate the static localized strings.
     i18nTemplate.process(this.document_, localStrings.templateData);
 
     // Always sharing the data model between the detail/thumb views confuses
     // them.  Instead we maintain this bogus data model, and hook it up to the
     // view that is not in use.
-    this.emptyDataModel_ = new cr.ui.table.TableDataModel([]);
+    this.emptyDataModel_ = new cr.ui.ArrayDataModel([]);
 
-    this.dataModel_ = new cr.ui.table.TableDataModel([]);
+    this.dataModel_ = new cr.ui.ArrayDataModel([]);
     this.dataModel_.sort('name');
-    this.dataModel_.addEventListener('sorted',
-                                this.onDataModelSorted_.bind(this));
     this.dataModel_.prepareSort = this.prepareSort_.bind(this);
 
     if (this.dialogType_ == FileManager.DialogType.SELECT_OPEN_FILE ||
         this.dialogType_ == FileManager.DialogType.SELECT_OPEN_FOLDER ||
         this.dialogType_ == FileManager.DialogType.SELECT_SAVEAS_FILE) {
-      this.selectionModelClass_ = cr.ui.table.TableSingleSelectionModel;
+      this.selectionModelClass_ = cr.ui.ListSingleSelectionModel;
     } else {
-      this.selectionModelClass_ = cr.ui.table.TableSelectionModel;
+      this.selectionModelClass_ = cr.ui.ListSelectionModel;
     }
 
     this.initTable_();
     this.initGrid_();
 
     this.setListType(FileManager.ListType.DETAIL);
 
     this.onResize_();
     this.dialogDom_.style.opacity = '1';
   };
@@ skipping 173 matching lines @@
       this.grid_.parentNode.clientWidth + 'px';
 
     this.table_.list_.style.width = this.table_.parentNode.clientWidth + 'px';
     this.table_.list_.style.height = (this.table_.clientHeight - 1 -
                                       this.table_.header_.clientHeight) + 'px';
 
     if (this.listType_ == FileManager.ListType.THUMBNAIL) {
       var self = this;
       setTimeout(function () {
           self.grid_.columns = 0;
           self.grid_.redraw();

[rginda, 2011/05/17 23:56:43]

I think this will need to become invalidateAndRedraw() too.

[vsevik, 2011/05/18 11:32:17]

This seems unrelated to this change which is complex enough already. Besides
that, I don't really understand what happens here. This onResize is used not
only as a resize handler, shouldn't we rename it?

[rginda, 2011/05/18 23:45:19]

Where did invalidateAndRedraw come from?  I thought you mentioned over chat that
you renamed redraw(), but that doesn't seem to be the case.

The grid codepath is there to make sure the grid recalculates the number of
columns for the new size.  It's done on a timeout to give the DOM a chance to
stabilize (though the grid column code has changed since this was written, and
the timeout may no longer be required.)

On 2011/05/18 11:32:17, vsevik wrote:

       }, 0);
     } else {
-      this.currentList_.redraw();
+      this.currentList_.invalidateAndRedraw();
     }
   };
 
   /**
    * Tweak the UI to become a particular kind of dialog, as determined by the
    * dialog type parameter passed to the constructor.
    */
   FileManager.prototype.initDialogType_ = function() {
     var defaultTitle;
     var okLabel = str('OPEN_LABEL');
@@ skipping 677 matching lines @@
             util.flog('Error deleting file: ' + entry.fullPath, onDelete));
       } else {
         entry.removeRecursively(
             onDelete,
             util.flog('Error deleting folder: ' + entry.fullPath, onDelete));
       }
     }
   };
 
   /**
-   * Invoked by the table dataModel after a sort completes.
-   *
-   * We use this hook to make sure selected files stay visible after a sort.
-   */
-  FileManager.prototype.onDataModelSorted_ = function() {
-    var i = this.currentList_.selectionModel.leadIndex;
-    this.currentList_.scrollIntoView(i);
-  }
-
-  /**
    * Update the selection summary UI when the selection summarization completes.
    */
   FileManager.prototype.onSelectionSummarized_ = function() {
     if (this.selection.totalCount == 0) {
       this.previewSummary_.textContent = str('NOTHING_SELECTED');
 
     } else if (this.selection.totalCount == 1) {
       this.previewSummary_.textContent =
         strf('ONE_FILE_SELECTED', cr.locale.bytesToSi(this.selection.bytes));
 
@@ skipping 112 matching lines @@
    *
    * @param {function()} opt_callback Optional function to invoke when the
    *     rescan is complete.
    */
   FileManager.prototype.rescanDirectory_ = function(opt_callback) {
     var self = this;
     var reader;
 
     function onReadSome(entries) {
       if (entries.length == 0) {
-        if (self.dataModel_.sortStatus.field != 'name')
-          self.dataModel_.updateIndex(0);
-
         if (opt_callback)
           opt_callback();
         return;
       }
 
       // Splice takes the to-be-spliced-in array as individual parameters,
       // rather than as an array, so we need to perform some acrobatics...
       var spliceArgs = [].slice.call(entries);
 
       // Hide files that start with a dot ('.').
@@ skipping 25 matching lines @@
       reader.readEntries(onReadSome);
       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
     self.dataModel_.splice.apply(self.dataModel_, spliceArgs);
-    self.dataModel_.updateIndex(0);
 
     if (opt_callback)
       opt_callback();
   };
 
   FileManager.prototype.findListItem_ = function(event) {
     var node = event.srcElement;
     while (node) {
       if (node.tagName == 'LI')
         break;
@@ skipping 360 matching lines @@
     } else if (this.dialogType_ == FileManager.DialogType.SELECT_OPEN_FILE) {
       if (!this.selection.leadEntry.isFile)
         throw new Error('Selected entry is not a file!');
     }
 
     chrome.fileBrowserPrivate.selectFile(ary[0], 0);
     // Window closed by above call.
   };
 
 })();