Escaping file names correctly. Also fixed a crush in chromeos debug build while saving a web page.

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 36 matching lines @@
   this.filterFiles_ = true;
 
   this.commands_ = {};
 
   this.document_ = dialogDom.ownerDocument;
   this.dialogType_ =
     this.params_.type || FileManager.DialogType.FULL_PAGE;
 
   this.defaultPath_ = this.params_.defaultPath || '/';
 
+  // Optional list of file types.
+  this.fileTypes_ = this.params_.typeList;
+
   this.showCheckboxes_ =
       (this.dialogType_ == FileManager.DialogType.FULL_PAGE ||
        this.dialogType_ == FileManager.DialogType.SELECT_OPEN_MULTI_FILE);
 
   // DirectoryEntry representing the current directory of the dialog.
   this.currentDirEntry_ = null;
 
   window.addEventListener('popstate', this.onPopState_.bind(this));
   this.addEventListener('directory-changed',
                         this.onDirectoryChanged_.bind(this));
@@ skipping 472 matching lines @@
     this.initTable_();
     this.initGrid_();
 
     this.setListType(FileManager.ListType.DETAIL);
 
     this.onResize_();
     this.dialogDom_.style.opacity = '1';
   };
 
   /**
+   * Encodes filename to compose file URL.
+   */
+  FileManager.prototype.encodeFileName_ = function(fileName) {
+    fileName = encodeURI(fileName);

[rginda, 2011/06/01 16:53:51]

If you switch to encodeURIComponent you won't need to clean up the # (or other
special url characters like ? and &).

[SeRya, 2011/06/02 08:42:40]

Done.

+
+    // '#' would be treated as ananchor mark of the url. Escape it.
+    fileName = fileName.replace(/#/g, '%23');
+    return fileName;
+  };
+
+  /**
+   * "Save a file" dislog is suttposed to have a combo box with available

[rginda, 2011/06/01 16:53:51]

dislog is suttposed => dialog is supposed

[SeRya, 2011/06/02 08:42:40]

Done.

+   * file types. Selecting an item filter files by extension and specifies how

[rginda, 2011/06/01 16:53:51]

filters files

[SeRya, 2011/06/02 08:42:40]

Done.

+   * file should be saved.
+   * @return {intener} Index of selected type from this.fileTypes_ + 1. 0
+   *                   means value is not specified.
+   */
+  FileManager.prototype.getSelectedFilterIndex_= function(fileName) {
+    // TODO(serya): Implement the combo box
+    // For now try to guess choice by file extension.
+    if (!this.fileTypes_ || this.fileTypes_.length == 0) return 0;
+
+    var extension = /\.[^\.]+$/.exec(fileName);
+    extension = extension ? extension[0].substring(1).toLowerCase() : "";
+    var result = 0;  // Use first type by default.
+    for (var i = 0; i < this.fileTypes_.length; i++) {
+      if (this.fileTypes_[i].extensions.indexOf(extension)) {
+        result = i;
+      }
+    }
+    return result + 1;  // 1-based index.
+  };
+
+  /**
    * Force the canExecute events to be dispatched.
    */
   FileManager.prototype.updateCommands_ = function() {
     this.commands_['rename'].canExecuteChange();
     this.commands_['delete'].canExecuteChange();
   };
 
   /**
    * Invoked to decide whether the "rename" command can be executed.
    */
@@ skipping 1495 matching lines @@
     if (currentDirUrl.charAt(currentDirUrl.length - 1) != '/')
       currentDirUrl += '/';
 
     if (this.dialogType_ == FileManager.DialogType.SELECT_SAVEAS_FILE) {
       // Save-as doesn't require a valid selection from the list, since
       // we're going to take the filename from the text input.
       var filename = this.filenameInput_.value;
       if (!filename)
         throw new Error('Missing filename!');
 
-      chrome.fileBrowserPrivate.selectFile(currentDirUrl + encodeURI(filename),
-                                           0);
+      chrome.fileBrowserPrivate.selectFile(
+          currentDirUrl + this.encodeFileName_(filename),
+          this.getSelectedFilterIndex_(filename));
       window.close();
       return;
     }
 
     var ary = [];
     var selectedIndexes = this.currentList_.selectionModel.selectedIndexes;
 
     // All other dialog types require at least one selected list item.
     // The logic to control whether or not the ok button is enabled should
     // prevent us from ever getting here, but we sanity check to be sure.
     if (!selectedIndexes.length)
       throw new Error('Nothing selected!');
 
     for (var i = 0; i < selectedIndexes.length; i++) {
       var entry = this.dataModel_.item(selectedIndexes[i]);
       if (!entry) {
         console.log('Error locating selected file at index: ' + i);
         continue;
       }
 
-      ary.push(currentDirUrl + encodeURI(entry.name));
+      ary.push(currentDirUrl + this.encodeFileName_(entry.name));
     }
 
     // Multi-file selection has no other restrictions.
     if (this.dialogType_ == FileManager.DialogType.SELECT_OPEN_MULTI_FILE) {
       chrome.fileBrowserPrivate.selectFiles(ary);
       window.close();
       return;
     }
 
     // In full screen mode, open all files for vieweing.
     if (this.dialogType_ == FileManager.DialogType.FULL_PAGE) {
       chrome.fileBrowserPrivate.viewFiles(ary, "default");
       // Window stays open.
       return;
     }
 
     // Everything else must have exactly one.
     if (ary.length > 1)
       throw new Error('Too many files selected!');
 
     if (this.dialogType_ == FileManager.DialogType.SELECT_FOLDER) {
       if (!this.selection.leadEntry.isDirectory)
         throw new Error('Selected entry is not a folder!');
     } 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);
+    chrome.fileBrowserPrivate.selectFile(
+        ary[0], this.getSelectedFilterIndex_(ary[0]));
     window.close();
   };
 
 })();