Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-15 03:00:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 400530 - Refactor beltzner to getReferrerOrSource(). r=sdwilsh, a1.9=mconnor, aM9=mconnor

Browse Source
This commit is contained in:
edward.lee@engineering.uiuc.edu 2007-10-27 13:37:44 -07:00
parent 4c1a3910ac
commit fb82e1fc2c
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
toolkit/mozapps/downloads/content/downloads.js
View File

@ -340,13 +340,7 @@ function openDownload(aDownload)
function openReferrer(aDownload)
{
var uriString;
if (aDownload.hasAttribute("referrer"))
uriString = aDownload.getAttribute("referrer");
else
uriString = aDownload.getAttribute("uri");
openURL(uriString);
openURL(getReferrerOrSource(aDownload));
}
function showDownloadInfo(aDownload)
@ -371,11 +365,7 @@ function showDownloadInfo(aDownload)
dateStarted.getMinutes(), 0);
popupTitle.setAttribute("value", dateStarted);
// Add proper uri and path
var uri = "beltzner";
if (aDownload.hasAttribute("referrer"))
uri = aDownload.getAttribute("referrer");
else
uri = aDownload.getAttribute("uri");
let uri = getReferrerOrSource(aDownload);
uriLabel.label = uri;
uriLabel.setAttribute("tooltiptext", uri);
var path = aDownload.getAttribute("path");
@ -477,8 +467,8 @@ function Startup()
if (!autoRemoveAndClose())
gDownloadsView.focus();
var obs = Components.classes["@mozilla.org/observer-service;1"].
getService(Components.interfaces.nsIObserverService);
let obs = Cc["@mozilla.org/observer-service;1"].
getService(Ci.nsIObserverService);
obs.addObserver(gDownloadObserver, "download-manager-remove-download", false);
}
@ -486,8 +476,8 @@ function Shutdown()
{
gDownloadManager.removeListener(gDownloadListener);
var obs = Components.classes["@mozilla.org/observer-service;1"].
getService(Components.interfaces.nsIObserverService);
let obs = Cc["@mozilla.org/observer-service;1"].
getService(Ci.nsIObserverService);
obs.removeObserver(gDownloadObserver, "download-manager-remove-download");
}
@ -855,6 +845,16 @@ function removeFromView(aDownload)
gDownloadsView.selectedIndex = Math.min(index, gDownloadsView.itemCount - 1);
}
function getReferrerOrSource(aDownload)
{
// Give the referrer if we have it set
if (aDownload.hasAttribute("referrer"))
return aDownload.getAttribute("referrer");
// Otherwise, provide the source
return aDownload.getAttribute("uri");
}
/**
* Builds the default view that the download manager starts out with.
*/