Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

231371 - downloading a file destroys the desktop

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@152030 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ben%bengoodger.com
2004-01-29 21:10:10 +00:00
parent 56e48ee132
commit 1b34f23858
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in
View File

@@ -128,7 +128,7 @@ nsUnknownContentTypeDialog.prototype = {
var prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
try {
result = prefs.getComplexValue(kDownloadFolderPref, Components.interfaces.nsILocalFile);
result = this.validateLeafName(result, aDefaultFile);
result = this.validateLeafName(result, aDefaultFile, aSuggestedFileExtension);
}
catch (e) {
// If we get here, it's because we have a new profile and the user has never configured download
@@ -185,7 +185,7 @@ nsUnknownContentTypeDialog.prototype = {
// code block.
prefs.setComplexValue("browser.download.defaultFolder", Components.interfaces.nsILocalFile, defaultFolder);
result = this.validateLeafName(defaultFolder, aDefaultFile);
result = this.validateLeafName(defaultFolder, aDefaultFile, aSuggestedFileExtension);
}
}
@@ -251,8 +251,10 @@ nsUnknownContentTypeDialog.prototype = {
return result;
},
validateLeafName: function (aLocalFile, aLeafName)
validateLeafName: function (aLocalFile, aLeafName, aFileExt)
{
if (aLeafName == "")
aLeafName = "unnamed" + (aFileExt ? "." + aFileExt : "");
aLocalFile.append(aLeafName);
// Since we're automatically downloading, we don't get the file picker's
@@ -734,7 +736,7 @@ nsUnknownContentTypeDialog.prototype = {
Components.interfaces.nsILocalFile);
var leafName = this.dialogElement("location").value;
// Ensure that we don't overwrite any existing files here.
targetFile = this.validateLeafName(targetFile, leafName);
targetFile = this.validateLeafName(targetFile, leafName, null);
}
catch(e) {}