file manager: Prevent [ENTER] from completing the save-as dialog in bad directories

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_METADATA = true;
 
 // Thumbnail view is painful without the exif reader.
 const ENABLE_THUMBNAIL_VIEW = ENABLE_METADATA;
@@ skipping 1529 matching lines @@
       event.preventDefault();
     }
   };
 
   /**
    * Update the UI when the selection model changes.
    *
    * @param {cr.Event} event The change event.
    */
   FileManager.prototype.onSelectionChanged_ = function(event) {
-    var selectable;

[rginda, 2011/06/07 23:35:35]

This was moved to updateOkButton_, where it should have been.

+    this.summarizeSelection_();
+    this.updatePreview_();
 
-    this.summarizeSelection_();
+    if (this.dialogType_ == FileManager.DialogType.SELECT_SAVEAS_FILE) {

[rginda, 2011/06/07 23:35:35]

This snippet came from updateOkButton_.  It was accidentally put there when
updateOkButton_ was extracted from this function.

+      // If this is a save-as dialog, copy the selected file into the filename
+      // input text box.
+      if (this.selection.leadEntry && this.selection.leadEntry.isFile)
+        this.filenameInput_.value = this.selection.leadEntry.name;
+    }
+
     this.updateOkButton_();
-    this.updatePreview_();
 
     var self = this;
     setTimeout(function() { self.onSelectionChangeComplete_(event) }, 0);
   };
 
+  /**
+   * Handle selection change related tasks that won't run properly during
+   * the actual selection change event.
+   */
   FileManager.prototype.onSelectionChangeComplete_ = function(event) {
     if (!this.showCheckboxes_)
       return;
 
     for (var i = 0; i < event.changes.length; i++) {
       // Turn off any checkboxes for items that are no longer selected.
       var selectedIndex = event.changes[i].index;
       var listItem = this.currentList_.getListItemByIndex(selectedIndex);
       if (!listItem) {
         // When changing directories, we get notified about list items
@@ skipping 16 matching lines @@
 
         var selectedIndex = this.selection.indexes[i];
         var listItem = this.currentList_.getListItemByIndex(selectedIndex);
         if (listItem)
           listItem.querySelector('input[type="checkbox"]').checked = true;
       }
     }
   };
 
   FileManager.prototype.updateOkButton_ = function(event) {
+    var selectable;
+
     if (this.dialogType_ == FileManager.DialogType.SELECT_FOLDER) {
       selectable = this.selection.directoryCount == 1 &&
           this.selection.fileCount == 0;
     } else if (this.dialogType_ == FileManager.DialogType.SELECT_OPEN_FILE) {
       selectable = (this.selection.directoryCount == 0 &&
                     this.selection.fileCount == 1);
     } else if (this.dialogType_ ==
                FileManager.DialogType.SELECT_OPEN_MULTI_FILE) {
       selectable = (this.selection.directoryCount == 0 &&
                     this.selection.fileCount >= 1);
     } else if (this.dialogType_ == FileManager.DialogType.SELECT_SAVEAS_FILE) {
-      if (this.selection.leadEntry && this.selection.leadEntry.isFile)
-        this.filenameInput_.value = this.selection.leadEntry.name;
-
       if (this.currentDirEntry_.fullPath == '/' ||
           this.currentDirEntry_.fullPath == MEDIA_DIRECTORY) {
         // Nothing can be saved in to the root or media/ directories.
         selectable = false;
       } else {
         selectable = !!this.filenameInput_.value;
       }
     } else if (this.dialogType_ == FileManager.DialogType.FULL_PAGE) {
       // No "select" buttons on the full page UI.
       selectable = true;
     } else {
       throw new Error('Unknown dialog type');
     }
 
     this.okButton_.disabled = !selectable;
+    return selectable;
   };
 
   /**
    * Handle a double-click event on an entry in the detail list.
    *
    * @param {Event} event The click event.
    */
   FileManager.prototype.onDetailDoubleClick_ = function(event) {
     if (this.renameInput_.currentEntry) {
       // Don't pay attention to double clicks during a rename.
@@ skipping 280 matching lines @@
 
   FileManager.prototype.cancelRename_ = function(event) {
     this.renameInput_.currentEntry = null;
     this.lastLabelClick_ = null;
 
     if (this.renameInput_.parentNode)
       this.renameInput_.parentNode.removeChild(this.renameInput_);
   };
 
   FileManager.prototype.onFilenameInputKeyUp_ = function(event) {
-    this.okButton_.disabled = this.filenameInput_.value.length == 0;
-
-    if (event.keyCode == 13 /* Enter */ && !this.okButton_.disabled)
+    var enabled = this.updateOkButton_();
+    if (enabled && event.keyCode == 13 /* Enter */)
       this.onOk_();
   };
 
   FileManager.prototype.onFilenameInputFocus_ = function(event) {
     var input = this.filenameInput_;
 
     // On focus we want to select everything but the extension, but
     // Chrome will select-all after the focus event completes.  We
     // schedule a timeout to alter the focus after that happens.
     setTimeout(function() {
@@ skipping 186 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.close();
   };
 
 })();