wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 746976 - Tapping a download notification for unknown files types should open the download manager to the download. r=wesj

Browse Source
This commit is contained in:
Federico Paolinelli 2013-05-28 16:31:27 -07:00
parent 720129aefb
commit 454716d0f1
2 changed files with 48 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
mobile/android/chrome/content/aboutDownloads.js
View File

@ -149,9 +149,9 @@ let Downloads = {
this._stepAddEntries(privateEntries, this._privateList, privateEntries.length);
// Add non-private downloads
let normalEntries = this.getDownloads({ isPrivate: false });
this._stepAddEntries(normalEntries, this._normalList, 1);
ContextMenus.init();
let normalEntries = this.getDownloads({ isPrivate: false });
this._stepAddEntries(normalEntries, this._normalList, 1, this._scrollToSelectedDownload.bind(this));
ContextMenus.init();
},
uninit: function dl_uninit() {
@ -358,6 +358,7 @@ let Downloads = {
let updatedState = this._getState(aStmt.row.state);
// Try to get the attribute values from the statement
return {
guid: aStmt.row.guid,
target: aStmt.row.name,
@ -377,9 +378,14 @@ let Downloads = {
}
},
_stepAddEntries: function dv__stepAddEntries(aEntries, aList, aNumItems) {
if (aEntries.length == 0)
_stepAddEntries: function dv__stepAddEntries(aEntries, aList, aNumItems, aCallback) {
if (aEntries.length == 0){
if (aCallback)
aCallback();
return;
}
let attrs = aEntries.shift();
let item = this._createItem(downloadTemplate, attrs);
@ -388,12 +394,12 @@ let Downloads = {
// Add another item to the list if we should; otherwise, let the UI update
// and continue later
if (aNumItems > 1) {
this._stepAddEntries(aEntries, aList, aNumItems - 1);
this._stepAddEntries(aEntries, aList, aNumItems - 1, aCallback);
} else {
// Use a shorter delay for earlier downloads to display them faster
let delay = Math.min(aList.itemCount * 10, 300);
setTimeout(function () {
this._stepAddEntries(aEntries, aList, 5);
this._stepAddEntries(aEntries, aList, 5, aCallback);
}.bind(this), delay);
}
},
@ -552,6 +558,31 @@ let Downloads = {
this.logError("_updateDownloadRow() " + ex, aDownload);
}
},
/**
* In case a specific downloadId was passed while opening, scrolls the list to
* the given elemenet
*/
_scrollToSelectedDownload : function dl_scrollToSelected() {
let spec = document.location.href;
let pos = spec.indexOf("?");
let query = "";
if (pos >= 0)
query = spec.substring(pos + 1);
// Just assume the query is "id=<id>"
let id = query.substring(3);
if (!id) {
return;
}
downloadElement = this._getElementForDownload(id);
if (!downloadElement) {
return;
}
downloadElement.scrollIntoView();
},
/**
* Logs the error to the console.

14
mobile/android/chrome/content/downloads.js
View File

@ -37,11 +37,17 @@ var Downloads = {
Services.obs.addObserver(this, "last-pb-context-exited", true);
},
openDownload: function dl_openDownload(aFileURI) {
let f = this._getLocalFile(aFileURI);
openDownload: function dl_openDownload(aDownload) {
let fileUri = aDownload.target.spec;
let guid = aDownload.guid;
let f = this._getLocalFile(fileUri);
try {
f.launch();
} catch (ex) { }
} catch (ex) {
// in case we are not able to open the file (i.e. there is no app able to handle it)
// we just open the browser tab showing it
BrowserApp.addTab("about:downloads?id=" + guid);
}
},
cancelDownload: function dl_cancelDownload(aDownload) {
@ -65,7 +71,7 @@ var Downloads = {
if (aTopic == "alertclickcallback") {
if (aDownload.state == Ci.nsIDownloadManager.DOWNLOAD_FINISHED) {
// Only open the downloaded file if the download is complete
self.openDownload(aDownload.target.spec);
self.openDownload(aDownload);
} else if (aDownload.state == Ci.nsIDownloadManager.DOWNLOAD_DOWNLOADING &&
!cancelPrompt) {
cancelPrompt = true;