Merge 87732 - file manager: Fix okButton updating.

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 54 matching lines @@
   this.addEventListener('directory-changed',
                         this.onDirectoryChanged_.bind(this));
   this.addEventListener('selection-summarized',
                         this.onSelectionSummarized_.bind(this));
 
   this.initCommands_();
   this.initDom_();
   this.initDialogType_();
 
   this.summarizeSelection_();
-  this.updateOkButton_();
   this.updatePreview_();
 
   chrome.fileBrowserPrivate.onDiskChanged.addListener(
       this.onDiskChanged_.bind(this));
 
   this.table_.list_.focus();
 
   if (ENABLE_EXIF_READER) {
     this.exifReader = new Worker('js/exif_reader.js');
     this.exifReader.onmessage = this.onExifReaderMessage_.bind(this);
@@ skipping 1564 matching lines @@
    *
    * @param {cr.Event} event The directory-changed event.
    */
   FileManager.prototype.onDirectoryChanged_ = function(event) {
     if (event.saveHistory) {
       history.pushState(this.currentDirEntry_.fullPath,
                         this.currentDirEntry_.fullPath,
                         location.href);
     }
 
+    this.updateOkButton_();
     // New folder should never be enabled in the root or media/ directories.
     this.newFolderButton_.disabled =
         (this.currentDirEntry_.fullPath == '/' ||
          this.currentDirEntry_.fullPath == MEDIA_DIRECTORY);
 
     this.document_.title = this.currentDirEntry_.fullPath;
     this.rescanDirectory_();
   };
 
   /**
@@ skipping 447 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.
   };
 
 })();