Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 567585 - TB3 fails to raise an error when it tries to save an attachment to write-protected directory. r=Paolo Amadini,r=sdwilsh

Browse Source
This commit is contained in:
ISHIKAWA, chiaki 2012-01-20 19:21:26 +00:00
parent 4c0bbbf9ab
commit 4f3f4ba2c5
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
toolkit/mozapps/downloads/nsHelperAppDlg.js
View File

@ -54,7 +54,7 @@
*
* @param aDirectory
* The directory to check.
* @returns true if we can use the directory, false otherwise.
* @return true if we can use the directory, false otherwise.
*/
function isUsableDirectory(aDirectory)
{
@ -64,11 +64,11 @@ function isUsableDirectory(aDirectory)
// Web progress listener so we can detect errors while mLauncher is
// streaming the data to a temporary file.
function nsUnkownContentTypeDialogProgressListener(aHelperAppDialog) {
function nsUnknownContentTypeDialogProgressListener(aHelperAppDialog) {
this.helperAppDlg = aHelperAppDialog;
}
nsUnkownContentTypeDialogProgressListener.prototype = {
nsUnknownContentTypeDialogProgressListener.prototype = {
// nsIWebProgressListener methods.
// Look for error notifications and display alert to user.
onStatusChange: function( aWebProgress, aRequest, aStatus, aMessage ) {
@ -121,7 +121,7 @@ nsUnkownContentTypeDialogProgressListener.prototype = {
};
///////////////////////////////////////////////////////////////////////////////
//// nsUnkownContentTypeDialog
//// nsUnknownContentTypeDialog
/* This file implements the nsIHelperAppLauncherDialog interface.
*
@ -214,7 +214,7 @@ nsUnknownContentTypeDialog.prototype = {
this.getSpecialFolderKey = this.mDialog.getSpecialFolderKey;
// Watch for error notifications.
var progressListener = new nsUnkownContentTypeDialogProgressListener(this);
var progressListener = new nsUnknownContentTypeDialogProgressListener(this);
this.mLauncher.setWebProgressListener(progressListener);
},
@ -354,7 +354,7 @@ nsUnknownContentTypeDialog.prototype = {
* the file system (or finds such a combination with a reasonably similar
* leaf name), creates the corresponding file, and returns it.
*
* @param aLocalFile
* @param aLocalFolder
* the folder where the file resides
* @param aLeafName
* the string name of the file (may be empty if no name is known,
@ -362,12 +362,12 @@ nsUnknownContentTypeDialog.prototype = {
* @param aFileExt
* the extension of the file, if one is known; this will be ignored
* if aLeafName is non-empty
* @returns nsILocalFile
* @return nsILocalFile
* the created file
*/
validateLeafName: function (aLocalFile, aLeafName, aFileExt)
validateLeafName: function (aLocalFolder, aLeafName, aFileExt)
{
if (!(aLocalFile && isUsableDirectory(aLocalFile)))
if (!(aLocalFolder && isUsableDirectory(aLocalFolder)))
return null;
// Remove any leading periods, since we don't want to save hidden files
@ -376,9 +376,9 @@ nsUnknownContentTypeDialog.prototype = {
if (aLeafName == "")
aLeafName = "unnamed" + (aFileExt ? "." + aFileExt : "");
aLocalFile.append(aLeafName);
aLocalFolder.append(aLeafName);
var createdFile = DownloadPaths.createNiceUniqueFile(aLocalFile);
var createdFile = DownloadPaths.createNiceUniqueFile(aLocalFolder);
#ifdef XP_WIN
let ext;
@ -392,8 +392,8 @@ nsUnknownContentTypeDialog.prototype = {
let leaf = createdFile.leafName;
if (ext && leaf.slice(-ext.length) != ext && createdFile.isExecutable()) {
createdFile.remove(false);
aLocalFile.leafName = leaf + ext;
createdFile = DownloadPaths.createNiceUniqueFile(aLocalFile);
aLocalFolder.leafName = leaf + ext;
createdFile = DownloadPaths.createNiceUniqueFile(aLocalFolder);
}
#endif