mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 830064 - The new downloads view does not support drag and drop. r=mak

This commit is contained in:
Asaf Romano 2013-01-16 22:39:16 +02:00
Родитель 6239a23ca7
Коммит 991900775b
2 изменённых файлов: 94 добавлений и 35 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

126
browser/components/downloads/content/allDownloadsViewOverlay.js
Просмотреть файл

@ -40,6 +40,22 @@ const DOWNLOAD_VIEW_SUPPORTED_COMMANDS =
const NOT_AVAILABLE = Number.MAX_VALUE;
/**
* Download a URL.
*
* @param aURL
* the url to download (nsIURI object)
* @param [optional] aFileName
* the destination file name
*/
function DownloadURL(aURL, aFileName) {
// For private browsing, try to get document out of the most recent browser
// window, or provide our own if there's no browser window.
let browserWin = RecentWindow.getMostRecentBrowserWindow();
let initiatingDoc = browserWin ? browserWin.document : document;
saveURL(aURL, aFileName, null, true, true, undefined, initiatingDoc);
}
/**
* A download element shell is responsible for handling the commands and the
* displayed data for a single download view element. The download element
@ -160,7 +176,7 @@ DownloadElementShell.prototype = {
},
_getIcon: function DES__getIcon() {
let metaData = this._getDownloadMetaData();
let metaData = this.getDownloadMetaData();
if ("filePath" in metaData)
return "moz-icon://" + metaData.filePath + "?size=32";
@ -213,7 +229,7 @@ DownloadElementShell.prototype = {
if (!this.active)
throw new Error("Trying to _fetchTargetFileInfo on an inactive download shell");
let path = this._getDownloadMetaData().filePath;
let path = this.getDownloadMetaData().filePath;
// In previous version, the target file annotations were not set,
// so we cannot tell where is the file.
@ -285,6 +301,8 @@ DownloadElementShell.prototype = {
* was downloaded. The file may not exist. This is set for session
* downloads that have a local file set, and for history downloads done
* after the landing of bug 591289.
* - fileName: the downloaded file name on the file system. Set if filePath
* is set.
* - displayName: the user-facing label for the download. This is always
* set. If available, it's set to the downloaded file name. If not,
* the places title for the download uri is used it's set. As a last
@ -294,15 +312,13 @@ DownloadElementShell.prototype = {
* bug 826991, this value is "static" - that is, it does not necessarily
* mean that the file is in place and has this size.
*/
_getDownloadMetaData: function DES__getDownloadMetaData() {
if (!this.active)
throw new Error("_getDownloadMetaData called for an inactive item.");
getDownloadMetaData: function DES_getDownloadMetaData() {
if (!this._metaData) {
if (this._dataItem) {
this._metaData = {
state: this._dataItem.state,
endTime: this._dataItem.endTime,
fileName: this._dataItem.target,
displayName: this._dataItem.target
};
if (this._dataItem.done)
@ -328,8 +344,9 @@ DownloadElementShell.prototype = {
try {
let targetFileURI = this._getAnnotation(DESTINATION_FILE_URI_ANNO);
[this._metaData.filePath, this._metaData.displayName] =
[this._metaData.filePath, this._metaData.fileName] =
this._extractFilePathAndNameFromFileURI(targetFileURI);
this._metaData.displayName = this._metaData.fileName;
}
catch(ex) {
this._metaData.displayName = this._placesNode.title || this.downloadURI;
@ -373,7 +390,7 @@ DownloadElementShell.prototype = {
// This is a not-in-progress or history download.
let stateLabel = "";
let state = this._getDownloadMetaData().state;
let state = this.getDownloadMetaData().state;
switch (state) {
case nsIDM.DOWNLOAD_FAILED:
stateLabel = s.stateFailed;
@ -392,7 +409,7 @@ DownloadElementShell.prototype = {
break;
case nsIDM.DOWNLOAD_FINISHED:{
// For completed downloads, show the file size (e.g. "1.5 MB")
let metaData = this._getDownloadMetaData();
let metaData = this.getDownloadMetaData();
if ("fileSize" in metaData) {
let [size, unit] = DownloadUtils.convertByteUnits(metaData.fileSize);
stateLabel = s.sizeWithUnits(size, unit);
@ -410,7 +427,7 @@ DownloadElementShell.prototype = {
this.downloadURI;
let [displayHost, fullHost] = DownloadUtils.getURIHost(referrer);
let date = new Date(this._getDownloadMetaData().endTime);
let date = new Date(this.getDownloadMetaData().endTime);
let [displayDate, fullDate] = DownloadUtils.getReadableDates(date);
// We use the same XUL label to display the state, the host name, and the
@ -436,7 +453,7 @@ DownloadElementShell.prototype = {
if (!this.active)
throw new Error("_updateDownloadStatusUI called for an inactive item.");
let state = this._getDownloadMetaData().state;
let state = this.getDownloadMetaData().state;
if (state !== undefined)
this._element.setAttribute("state", state);
@ -474,7 +491,7 @@ DownloadElementShell.prototype = {
},
_updateDisplayNameAndIcon: function DES__updateDisplayNameAndIcon() {
let metaData = this._getDownloadMetaData();
let metaData = this.getDownloadMetaData();
this._element.setAttribute("displayName", metaData.displayName);
this._element.setAttribute("image", this._getIcon());
},
@ -491,7 +508,7 @@ DownloadElementShell.prototype = {
// For history downloads done in past releases, the downloads/metaData
// annotation is not set, and therefore we cannot tell the download
// state without the target file information.
if (this._dataItem || this._getDownloadMetaData().state !== undefined)
if (this._dataItem || this.getDownloadMetaData().state !== undefined)
this._updateDownloadStatusUI();
else
this._fetchTargetFileInfo(true);
@ -504,7 +521,7 @@ DownloadElementShell.prototype = {
placesNodeTitleChanged: function DES_placesNodeTitleChanged() {
// If there's a file path, we use the leaf name for the title.
if (!this._dataItem && this.active && !this._getDownloadMetaData().filePath) {
if (!this._dataItem && this.active && !this.getDownloadMetaData().filePath) {
this._metaData = null;
this._updateDisplayNameAndIcon();
}
@ -514,7 +531,7 @@ DownloadElementShell.prototype = {
this._annotations.delete(aAnnoName);
if (!this._dataItem && this.active) {
if (aAnnoName == DOWNLOAD_META_DATA_ANNO) {
let metaData = this._getDownloadMetaData();
let metaData = this.getDownloadMetaData();
let annotatedMetaData = this._getAnnotatedMetaData();
metaData.endTme = annotatedMetaData.endTime;
if ("fileSize" in annotatedMetaData)
@ -531,10 +548,11 @@ DownloadElementShell.prototype = {
this._updateDownloadStatusUI();
}
else if (aAnnoName == DESTINATION_FILE_URI_ANNO) {
let metaData = this._getDownloadMetaData();
let metaData = this.getDownloadMetaData();
let targetFileURI = this._getAnnotation(DESTINATION_FILE_URI_ANNO);
[metaData.filePath, metaData.displayName] =
[metaData.filePath, metaData.fileName] =
this._extractFilePathAndNameFromFileURI(targetFileURI);
metaData.displayName = metaData.fileName;
this._updateDisplayNameAndIcon();
if (this._targetFileInfoFetched) {
@ -548,7 +566,7 @@ DownloadElementShell.prototype = {
/* DownloadView */
onStateChange: function DES_onStateChange(aOldState) {
let metaData = this._getDownloadMetaData();
let metaData = this.getDownloadMetaData();
metaData.state = this.dataItem.state;
if (aOldState != nsIDM.DOWNLOAD_FINISHED && aOldState != metaData.state) {
// See comment in DVI_onStateChange in downloads.js (the panel-view)
@ -590,7 +608,7 @@ DownloadElementShell.prototype = {
// If the target file information is not yet fetched,
// temporarily assume that the file is in place.
return this._getDownloadMetaData().state == nsIDM.DOWNLOAD_FINISHED;
return this.getDownloadMetaData().state == nsIDM.DOWNLOAD_FINISHED;
}
case "downloadsCmd_show": {
// TODO: Bug 827010 - Handle part-file asynchronously.
@ -603,7 +621,7 @@ DownloadElementShell.prototype = {
// If the target file information is not yet fetched,
// temporarily assume that the file is in place.
return this._getDownloadMetaData().state == nsIDM.DOWNLOAD_FINISHED;
return this.getDownloadMetaData().state == nsIDM.DOWNLOAD_FINISHED;
}
case "downloadsCmd_pauseResume":
return this._dataItem && this._dataItem.inProgress && this._dataItem.resumable;
@ -627,13 +645,7 @@ DownloadElementShell.prototype = {
// In future we may try to download into the same original target uri, when
// we have it. Though that requires verifying the path is still valid and
// may surprise the user if he wants to be requested every time.
// For private browsing, try to get document out of the most recent browser
// window, or provide our own if there's no browser window.
let browserWin = RecentWindow.getMostRecentBrowserWindow();
let initiatingDoc = browserWin ? browserWin.document : document;
saveURL(this.downloadURI, this._getDownloadMetaData().displayName, null, true, true, undefined,
initiatingDoc);
DownloadURL(this.downloadURI, this.getDownloadMetaData().fileName);
},
/* nsIController */
@ -642,7 +654,7 @@ DownloadElementShell.prototype = {
case "downloadsCmd_open": {
let file = this._dataItem ?
this.dataItem.localFile :
new FileUtils.File(this._getDownloadMetaData().filePath);
new FileUtils.File(this.getDownloadMetaData().filePath);
DownloadsCommon.openDownloadedFile(file, null, window);
break;
@ -652,7 +664,7 @@ DownloadElementShell.prototype = {
this._dataItem.showLocalFile();
}
else {
let file = new FileUtils.File(this._getDownloadMetaData().filePath);
let file = new FileUtils.File(this.getDownloadMetaData().filePath);
DownloadsCommon.showDownloadedFile(file);
}
break;
@ -693,8 +705,8 @@ DownloadElementShell.prototype = {
if (!aTerm)
return true;
aTerm = aTerm.toLowerCase();
return this._getDownloadMetaData().displayName.toLowerCase().indexOf(aTerm) != -1 ||
this.downloadURI.toLowerCase().indexOf(aTerm) != -1;
return this.getDownloadMetaData().displayName.toLowerCase().contains(aTerm) ||
this.downloadURI.toLowerCase().contains(aTerm);
},
// Handles return kepress on the element (the keypress listener is
@ -722,7 +734,7 @@ DownloadElementShell.prototype = {
}
return "";
}
let command = getDefaultCommandForState(this._getDownloadMetaData().state);
let command = getDefaultCommandForState(this.getDownloadMetaData().state);
if (this.isCommandEnabled(command))
this.doCommand(command);
},
@ -1308,7 +1320,6 @@ DownloadsPlacesView.prototype = {
return false;
},
isCommandEnabled: function DPV_isCommandEnabled(aCommand) {
switch (aCommand) {
case "cmd_copy":
@ -1378,7 +1389,7 @@ DownloadsPlacesView.prototype = {
_downloadURLFromClipboard: function DPV__downloadURLFromClipboard() {
let [url, name] = this._getURLFromClipboardData();
saveURL(url, name || url, null, true, true, undefined, document);
DownloadURL(url, name);
},
doCommand: function DPV_doCommand(aCommand) {
@ -1426,7 +1437,7 @@ DownloadsPlacesView.prototype = {
// Set the state attribute so that only the appropriate items are displayed.
let contextMenu = document.getElementById("downloadsContextMenu");
let state = element._shell._getDownloadMetaData().state;
let state = element._shell.getDownloadMetaData().state;
if (state !== undefined)
contextMenu.setAttribute("state", state);
else
@ -1481,6 +1492,51 @@ DownloadsPlacesView.prototype = {
if (elt._shell)
elt._shell.onSelect();
}
},
onDragStart: function DPV_onDragStart(aEvent) {
// TODO Bug 831358: Support d&d for multiple selection.
// For now, we just drag the first element.
let selectedItem = this._richlistbox.selectedItem;
if (!selectedItem)
return;
let metaData = selectedItem._shell.getDownloadMetaData();
if (!("filePath" in metaData))
return;
let file = new FileUtils.File(metaData.filePath);
if (!file.exists())
return;
let dt = aEvent.dataTransfer;
dt.mozSetDataAt("application/x-moz-file", file, 0);
let url = Services.io.newFileURI(file).spec;
dt.setData("text/uri-list", url);
dt.setData("text/plain", url);
dt.effectAllowed = "copyMove";
dt.addElement(selectedItem);
},
onDragOver: function DPV_onDragOver(aEvent) {
let types = aEvent.dataTransfer.types;
if (types.contains("text/uri-list") ||
types.contains("text/x-moz-url") ||
types.contains("text/plain")) {
aEvent.preventDefault();
}
},
onDrop: function DPV_onDrop(aEvent) {
let dt = aEvent.dataTransfer;
// If dragged item is from our source, do not try to
// redownload already downloaded file.
if (dt.mozGetDataAt("application/x-moz-file", 0))
return;
let name = { };
let url = Services.droppedLinkHandler.dropLink(aEvent, name);
if (url)
DownloadURL(url, name.value);
}
};

3
browser/components/downloads/content/allDownloadsViewOverlay.xul
Просмотреть файл

@ -46,6 +46,9 @@
onkeypress="return this._placesView.onKeyPress(event);"
ondblclick="return this._placesView.onDoubleClick(event);"
oncontextmenu="return this._placesView.onContextMenu(event);"
ondragstart="this._placesView.onDragStart(event);"
ondragover="this._placesView.onDragOver(event);"
ondrop="this._placesView.onDrop(event);"
onfocus="goUpdateDownloadCommands();"
onselect="this._placesView.onSelect();"
onblur="goUpdateDownloadCommands();"/>