summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/palemoon/components/downloads/DownloadsCommon.jsm9
-rw-r--r--application/palemoon/components/downloads/content/allDownloadsViewOverlay.js4
-rw-r--r--application/palemoon/components/downloads/content/downloads.js2
-rw-r--r--application/palemoon/components/downloads/content/downloadsViewCommon.js10
4 files changed, 10 insertions, 15 deletions
diff --git a/application/palemoon/components/downloads/DownloadsCommon.jsm b/application/palemoon/components/downloads/DownloadsCommon.jsm
index e110aa904..652d2433b 100644
--- a/application/palemoon/components/downloads/DownloadsCommon.jsm
+++ b/application/palemoon/components/downloads/DownloadsCommon.jsm
@@ -413,8 +413,7 @@ this.DownloadsCommon = {
* complete.
* percentComplete : The percentage of bytes successfully downloaded.
*/
-summarizeDownloads(downloads) {
- {
+ summarizeDownloads(downloads) {
let summary = {
numActive: 0,
numPaused: 0,
@@ -1480,7 +1479,6 @@ const DownloadsViewPrototype = {
* @note Subclasses should override this.
*/
onDownloadChanged(download) {
- {
throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
},
@@ -1574,7 +1572,6 @@ DownloadsIndicatorDataCtor.prototype = {
},
onDownloadAdded(download, newest) {
- {
this._itemCount++;
this._updateViews();
},
@@ -1691,7 +1688,7 @@ DownloadsIndicatorDataCtor.prototype = {
* to generate statistics about the downloads we care about - in this case,
* it's all active downloads.
*/
- _activeDownloads() {
+ _activeDownloads: function* () {
let downloads = this._isPrivate ? PrivateDownloadsData.downloads
: DownloadsData.downloads;
for (let download of downloads) {
@@ -1897,7 +1894,7 @@ DownloadsSummaryData.prototype = {
* it's the downloads in this._downloads after the first few to exclude,
* which was set when constructing this DownloadsSummaryData instance.
*/
- _downloadsForSummary() {
+ _downloadsForSummary: function* () {
if (this._downloads.length > 0) {
for (let i = this._numToExclude; i < this._downloads.length; ++i) {
yield this._downloads[i];
diff --git a/application/palemoon/components/downloads/content/allDownloadsViewOverlay.js b/application/palemoon/components/downloads/content/allDownloadsViewOverlay.js
index a895bd9f6..a5cbb3a5f 100644
--- a/application/palemoon/components/downloads/content/allDownloadsViewOverlay.js
+++ b/application/palemoon/components/downloads/content/allDownloadsViewOverlay.js
@@ -251,8 +251,9 @@ HistoryDownloadElementShell.prototype = {
if (this.element.selected) {
goUpdateDownloadCommands();
- else
+ } else {
goUpdateCommand("downloadsCmd_clearDownloads");
+ }
},
onChanged() {
@@ -720,7 +721,6 @@ DownloadsPlacesView.prototype = {
// the top of the richlistbox, along with other session downloads.
// More generally, if a new download is added, should be made visible.
this._richlistbox.ensureElementIsVisible(newOrUpdatedShell.element);
- }
} else if (sessionDownload) {
let before = this._lastSessionDownloadElement ?
this._lastSessionDownloadElement.nextSibling : this._richlistbox.firstChild;
diff --git a/application/palemoon/components/downloads/content/downloads.js b/application/palemoon/components/downloads/content/downloads.js
index 9a6aa97e9..01682d325 100644
--- a/application/palemoon/components/downloads/content/downloads.js
+++ b/application/palemoon/components/downloads/content/downloads.js
@@ -807,7 +807,6 @@ const DownloadsView = {
* asynchronous data load.
*/
onDownloadAdded(download, aNewest) {
- {
DownloadsCommon.log("A new download data item was added - aNewest =",
aNewest);
@@ -911,7 +910,6 @@ const DownloadsView = {
* Removes the view item associated with the specified data item.
*/
_removeViewItem(download) {
- {
DownloadsCommon.log("Removing a DownloadsViewItem from the downloads list.");
let element = this._visibleViewItems.get(download).element;
let previousSelectedIndex = this.richListBox.selectedIndex;
diff --git a/application/palemoon/components/downloads/content/downloadsViewCommon.js b/application/palemoon/components/downloads/content/downloadsViewCommon.js
index 9ef492764..999d82317 100644
--- a/application/palemoon/components/downloads/content/downloadsViewCommon.js
+++ b/application/palemoon/components/downloads/content/downloadsViewCommon.js
@@ -12,7 +12,7 @@
"use strict";
-let { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
+var { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
@@ -91,16 +91,16 @@ DownloadElementShell.prototype = {
get extendedDisplayName() {
let s = DownloadsCommon.strings;
- let referrer = this.dataItem.download.source.referrer ||
- this.dataItem.download.source.url;
+ let referrer = this.download.source.referrer ||
+ this.download.source.url;
let [displayHost, fullHost] = DownloadUtils.getURIHost(referrer);
return s.statusSeparator(this.displayName, displayHost);
},
get extendedDisplayNameTip() {
let s = DownloadsCommon.strings;
- let referrer = this.dataItem.download.source.referrer ||
- this.dataItem.download.source.url;
+ let referrer = this.download.source.referrer ||
+ this.download.source.url;
let [displayHost, fullHost] = DownloadUtils.getURIHost(referrer);
return s.statusSeparator(this.displayName, fullHost);
},