Fixing column widths in tables.

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 997 matching lines @@
       /** @type {cr.ui.List} */
       this.currentList_ = this.grid_;
       this.dialogDom_.querySelector('#thumbnail-view').disabled = true;
       this.dialogDom_.querySelector('#detail-view').disabled = false;
     } else {
       throw new Error('Unknown list type: ' + type);
     }
 
     this.listType_ = type;
     this.updateStartupPrefs_();
-    this.updateColumnModel_();
     this.onResize_();
 
     this.table_.list.endBatchUpdates();
     this.grid_.endBatchUpdates();
   };
 
   /**
    * Initialize the file thumbnail grid.
    */
   FileManager.prototype.initGrid_ = function() {
@@ skipping 20 matching lines @@
 
     var columns = [
         new cr.ui.table.TableColumn('name', str('NAME_COLUMN_LABEL'),
                                     fullPage ? 470 : 324),
         new cr.ui.table.TableColumn('size', str('SIZE_COLUMN_LABEL'),
                                     fullPage ? 110 : 92, true),
         new cr.ui.table.TableColumn('type', str('TYPE_COLUMN_LABEL'),
                                     fullPage ? 200 : 160),
         new cr.ui.table.TableColumn('modificationTime',
                                     str('DATE_COLUMN_LABEL'),
-                                    fullPage ? 150 : 210)
+                                    fullPage ? 150 : 210),
+        new cr.ui.table.TableColumn('offline',
+                                    str('OFFLINE_COLUMN_LABEL'),
+                                    150)
     ];
 
     // TODO(dgozman): refactor render/update/display stuff.
     columns[0].renderFunction = this.renderName_.bind(this);
     columns[1].renderFunction = this.renderSize_.bind(this);
     columns[1].defaultOrder = 'desc';
     columns[2].renderFunction = this.renderType_.bind(this);
     columns[3].renderFunction = this.renderDate_.bind(this);
     columns[3].defaultOrder = 'desc';
 
     if (this.showCheckboxes_) {
       columns[0].headerRenderFunction =
           this.renderNameColumnHeader_.bind(this, columns[0].name);
     }
 
-    this.regularColumnModel_ = new cr.ui.table.TableColumnModel(columns);
+    columns[4].renderFunction = this.renderOffline_.bind(this);
 
+    var columnModel = new cr.ui.table.TableColumnModel(columns);
+    columnModel.__defineGetter__('size', function() {

[arv (Not doing code reviews), 2012/11/30 19:05:52]

Don't use __defineGetter___. Use ES5 Object.defineProperty instead.

Why are you overriding the getter here though? Would it be cleaner if you
extracted this into a subclass?

[SeRya, 2012/12/01 20:14:37]

Done.
Just to keep this change simple. It indeed needs some reorganizing (even comment
in line 1064 states so).

+      if (fullPage && this.isOnGData())
+        return columns.length;
+      else
+        return columns.length - 1;
+    }.bind(this));
     if (fullPage) {
-      columns.push(new cr.ui.table.TableColumn(
-          'offline', str('OFFLINE_COLUMN_LABEL'), 150));
-      columns[4].renderFunction = this.renderOffline_.bind(this);
-
-      this.gdataColumnModel_ = new cr.ui.table.TableColumnModel(columns);
-    } else {
-      this.gdataColumnModel_ = null;
+      function isOnDrive(entry) {

[arv (Not doing code reviews), 2012/11/30 19:05:52]

FunctionDeclaration is not allowed here. "use strict" would have told you so.

The simplest thing is to change to a FunctionExpression.

[SeRya, 2012/12/01 20:14:37]

Done.

+        return PathUtil.getRootType(entry.fullPath) == RootType.GDATA;
+      }
+      var table = this.table_;
+      this.directoryModel_.addEventListener('directory-changed', function(e) {
+        if (isOnDrive(e.previousDirEntry) != isOnDrive(e.newDirEntry)) {
+          // Columns number changed.
+          table.redraw();
+        }
+      });
     }
+    this.table_.columnModel = columnModel;
 
     this.table_.list.addEventListener('click', this.onDetailClick_.bind(this));
   };
 
   FileManager.prototype.onCopyProgress_ = function(event) {
     if (event.reason === 'ERROR' &&
         event.error.reason === 'FILESYSTEM_ERROR' &&
         event.error.data.toGDrive &&
         event.error.data.code == FileError.QUOTA_EXCEEDED_ERR) {
       this.alert.showHtml(
@@ skipping 32 matching lines @@
                                        entry.name.length - 1);
       return dirPath == currentPath;
     }
     for (var i = 0; i < event.affectedEntries.length; i++) {
       entry = event.affectedEntries[i];
       if (inCurrentDirectory(entry))
         this.directoryModel_.onEntryChanged(entry.name);
     }
   };
 
-  FileManager.prototype.updateColumnModel_ = function() {
-    if (this.listType_ != FileManager.ListType.DETAIL)
-      return;
-    this.table_.columnModel =
-        (this.isOnGData() && this.gdataColumnModel_) ?
-            this.gdataColumnModel_ :
-            this.regularColumnModel_;
-  };
-
   /**
    * Fills the file type list or hides it.
    */
   FileManager.prototype.initFileTypeFilter_ = function() {
     if (this.params_.includeAllFiles) {
       var option = this.document_.createElement('option');
       option.innerText = str('ALL_FILES_FILTER');
       this.fileTypeSelector_.appendChild(option);
       option.value = 0;
     }
@@ skipping 1256 matching lines @@
       searchBox.value = '';
   },
 
   /**
    * Update the UI when the current directory changes.
    *
    * @param {cr.Event} event The directory-changed event.
    */
   FileManager.prototype.onDirectoryChanged_ = function(event) {
     this.selectionHandler_.onSelectionChanged();
-    this.updateColumnModel_();
     this.updateSearchBoxOnDirChange_();
 
     util.updateAppState(event.initial, this.getCurrentDirectory());
 
     if (this.closeOnUnmount_ && !event.initial &&
           PathUtil.getRootPath(event.previousDirEntry.fullPath) !=
           PathUtil.getRootPath(event.newDirEntry.fullPath)) {
       this.closeOnUnmount_ = false;
     }
 
@@ skipping 942 matching lines @@
     return this.directoryModel_.getFileList();
   };
 
   /**
    * @return {cr.ui.List} Current list object.
    */
   FileManager.prototype.getCurrentList = function() {
     return this.currentList_;
   };
 })();