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

Fix 'archivefolder' completion to match that of :goto et al.

Browse Source
This commit is contained in:
Doug Kearns
2009-06-28 15:47:59 +10:00
parent f3fd72b776
commit d81ea622e8
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
muttator/content/mail.js
View File

@@ -90,16 +90,6 @@ function Mail() //{{{
var notifyFlags = nsIFolderListener.intPropertyChanged | nsIFolderListener.event; var notifyFlags = nsIFolderListener.intPropertyChanged | nsIFolderListener.event;
mailSession.AddFolderListener(folderListener, notifyFlags); mailSession.AddFolderListener(folderListener, notifyFlags);
function getFolderCompletions(context)
{
let folders = mail.getFolders(context.filter);
context.anchored = false;
context.quote = false;
context.completions = folders.map(function (folder)
[folder.server.prettyName + ": " + folder.name,
"Unread: " + folder.getNumUnread(false)]);
}
function getCurrentFolderIndex() function getCurrentFolderIndex()
{ {
// for some reason, the index is interpreted as a string, therefore the parseInt // for some reason, the index is interpreted as a string, therefore the parseInt
@@ -186,7 +176,7 @@ function Mail() //{{{
"Set the archive folder", "Set the archive folder",
"string", "Archive", "string", "Archive",
{ {
completer: function (context) [[f.prettiestName, ""] for ([,f] in Iterator(mail.getFolders()))], completer: function (context) completion.mailFolder(context),
validator: Option.validateCompleter validator: Option.validateCompleter
}); });
@@ -687,7 +677,7 @@ function Mail() //{{{
}, },
{ {
argCount: "?", argCount: "?",
completer: function (context) getFolderCompletions(context), completer: function (context) completion.mailFolder(context),
count: true, count: true,
literal: 0 literal: 0
}); });
@@ -729,7 +719,7 @@ function Mail() //{{{
function (args) { moveOrCopy(true, args.literalArg); }, function (args) { moveOrCopy(true, args.literalArg); },
{ {
argCount: 1, argCount: 1,
completer: function (context) getFolderCompletions(context), completer: function (context) completion.mailFolder(context),
literal: 0 literal: 0
}); });
@@ -738,7 +728,7 @@ function Mail() //{{{
function (args) { moveOrCopy(false, args.literalArg); }, function (args) { moveOrCopy(false, args.literalArg); },
{ {
argCount: 1, argCount: 1,
completer: function (context) getFolderCompletions(context), completer: function (context) completion.mailFolder(context),
literal: 0 literal: 0
}); });
@@ -755,11 +745,24 @@ function Mail() //{{{
bang: true, bang: true,
}); });
/////////////////////////////////////////////////////////////////////////////}}}
////////////////////// COMPLETIONS /////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////{{{
completion.mailFolder = function mailFolder(context) {
let folders = mail.getFolders(context.filter);
context.anchored = false;
context.quote = false;
context.completions = folders.map(function (folder)
[folder.server.prettyName + ": " + folder.name,
"Unread: " + folder.getNumUnread(false)]);
};
/////////////////////////////////////////////////////////////////////////////}}} /////////////////////////////////////////////////////////////////////////////}}}
////////////////////// PUBLIC SECTION ////////////////////////////////////////// ////////////////////// PUBLIC SECTION //////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////{{{ /////////////////////////////////////////////////////////////////////////////{{{
return { return {
get currentAccount() this.currentFolder.rootFolder, get currentAccount() this.currentFolder.rootFolder,
@@ -910,12 +913,13 @@ function Mail() //{{{
}, },
/** /**
* General-purpose method to find messages * General-purpose method to find messages.
* *
* @param {function} validatorFunc(msg): return true/false whether msg should be selected or not * @param {function(nsIMsgDBHdr):boolean} validatorFunc Return
* @param {boolean} canWrap: when true, wraps around folders * true/false whether msg should be selected or not.
* @param {boolean} openThreads: should we open closed threads? * @param {boolean} canWrap When true, wraps around folders.
* @param {boolean} reverse: change direction of searching * @param {boolean} openThreads Should we open closed threads?
* @param {boolean} reverse Change direction of searching.
*/ */
selectMessage: function (validatorFunc, canWrap, openThreads, reverse, count) selectMessage: function (validatorFunc, canWrap, openThreads, reverse, count)
{ {