gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-12 00:35:48 +01:00
Code Issues Projects Releases Wiki Activity

Only echo the download complete message in the active window.

Browse Source 
--HG--
branch : testing
This commit is contained in:
Kris Maglione
2010-06-17 08:25:41 -04:00
parent a72c4af900
commit 05a3bcf180
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/content/commandline.js
View File

@@ -331,10 +331,11 @@ const CommandLine = Module("commandline", {
FORCE_MULTILINE : 1 << 0, FORCE_MULTILINE : 1 << 0,
FORCE_SINGLELINE : 1 << 1, FORCE_SINGLELINE : 1 << 1,
DISALLOW_MULTILINE : 1 << 2, // if an echo() should try to use the single line DISALLOW_MULTILINE : 1 << 2, // If an echo() should try to use the single line
// but output nothing when the MOW is open; when also // but output nothing when the MOW is open; when also
// FORCE_MULTILINE is given, FORCE_MULTILINE takes precedence // FORCE_MULTILINE is given, FORCE_MULTILINE takes precedence
APPEND_TO_MESSAGES : 1 << 3, // add the string to the message this._history APPEND_TO_MESSAGES : 1 << 3, // Add the string to the message this._history.
ACTIVE_WINDOW : 1 << 4, // Only echo in active window.
get completionContext() this._completions.context, get completionContext() this._completions.context,
@@ -501,6 +502,10 @@ const CommandLine = Module("commandline", {
if (flags & this.APPEND_TO_MESSAGES) if (flags & this.APPEND_TO_MESSAGES)
this._messageHistory.add({ str: str, highlight: highlightGroup }); this._messageHistory.add({ str: str, highlight: highlightGroup });
if ((flags & this.ACTIVE_WINDOW) &&
window != services.get("windowWatcher").activeWindow &&
services.get("windowWatcher").activeWindow.liberator)
return;
// The DOM isn't threadsafe. It must only be accessed from the main thread. // The DOM isn't threadsafe. It must only be accessed from the main thread.
liberator.callInMainThread(function () { liberator.callInMainThread(function () {

2
common/content/io.js
View File

@@ -340,7 +340,7 @@ const IO = Module("io", {
let file = download.targetFile.path; let file = download.targetFile.path;
let size = download.size; let size = download.size;
liberator.echomsg("Download of " + title + " to " + file + " finished", 1); liberator.echomsg("Download of " + title + " to " + file + " finished", 1, commandline.ACTIVE_WINDOW);
autocommands.trigger("DownloadPost", { url: url, title: title, file: file, size: size }); autocommands.trigger("DownloadPost", { url: url, title: title, file: file, size: size });
} }
}, },