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

Prefer let over var in muttator modules.

Browse Source
This commit is contained in:
Doug Kearns
2009-06-08 23:31:52 +10:00
parent 32106364f5
commit 3bfa2d39d5
3 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
muttator/TODO
View File

@@ -2,6 +2,11 @@ Priority list:
1-9 as in vim (9=required for next release, 5=would be nice, 1=probably not) 1-9 as in vim (9=required for next release, 5=would be nice, 1=probably not)
BUGS: BUGS:
- several tab related commands like :tab are enabled but don't work
- MOW is broken - always uses a height of less than one line
- stal=1 doesn't work
(recent CVS regressions):
FEATURES: FEATURES:
9 edit messages with vim 9 edit messages with vim

51
muttator/content/addressbook.js
View File

@@ -39,10 +39,6 @@ function Addressbook() //{{{
const kPersonalAddressbookURI = "moz-abmdbdirectory://abook.mab"; const kPersonalAddressbookURI = "moz-abmdbdirectory://abook.mab";
function load()
{
}
// TODO: add option for a format specifier, like: // TODO: add option for a format specifier, like:
// :set displayname=%l, %f // :set displayname=%l, %f
function generateDisplayName(firstName, lastName) function generateDisplayName(firstName, lastName)
@@ -77,10 +73,9 @@ function Addressbook() //{{{
"Open a prompt to save a new addressbook entry for the sender of the selected message", "Open a prompt to save a new addressbook entry for the sender of the selected message",
function () function ()
{ {
var to;
try try
{ {
to = gDBView.hdrForFirstSelectedMessage.mime2DecodedAuthor; var to = gDBView.hdrForFirstSelectedMessage.mime2DecodedAuthor;
} }
catch (e) catch (e)
{ {
@@ -90,12 +85,12 @@ function Addressbook() //{{{
if (!to) if (!to)
return; return;
var address = to.substring(to.indexOf("<") + 1, to.indexOf(">")); let address = to.substring(to.indexOf("<") + 1, to.indexOf(">"));
var displayName = to.substr(0, to.indexOf("<") - 1); let displayName = to.substr(0, to.indexOf("<") - 1);
if (/^\S+\s+\S+\s*$/.test(displayName)) if (/^\S+\s+\S+\s*$/.test(displayName))
{ {
var names = displayName.split(/\s+/); let names = displayName.split(/\s+/);
displayName = "-firstname=" + names[0].replace(/"/g, "") displayName = "-firstname=" + names[0].replace(/"/g, "")
+ " -lastname=" + names[1].replace(/"/g, ""); + " -lastname=" + names[1].replace(/"/g, "");
} }
@@ -113,10 +108,10 @@ function Addressbook() //{{{
"Add an address book entry", "Add an address book entry",
function (args) function (args)
{ {
var mailAddr = args[0]; // TODO: support more than one email address let mailAddr = args[0]; // TODO: support more than one email address
var firstName = args["-firstname"] || null; let firstName = args["-firstname"] || null;
var lastName = args["-lastname"] || null; let lastName = args["-lastname"] || null;
var displayName = args["-name"] || null; let displayName = args["-name"] || null;
if (!displayName) if (!displayName)
displayName = generateDisplayName(firstName, lastName); displayName = generateDisplayName(firstName, lastName);
@@ -146,8 +141,8 @@ function Addressbook() //{{{
add: function (address, firstname, lastname, displayName) add: function (address, firstname, lastname, displayName)
{ {
var directory = getDirectoryFromURI(kPersonalAddressbookURI); let directory = getDirectoryFromURI(kPersonalAddressbookURI);
var card = Components.classes["@mozilla.org/addressbook/cardproperty;1"] let card = Components.classes["@mozilla.org/addressbook/cardproperty;1"]
.createInstance(Components.interfaces.nsIAbCard); .createInstance(Components.interfaces.nsIAbCard);
if (!address || !directory || !card) if (!address || !directory || !card)
@@ -164,19 +159,19 @@ function Addressbook() //{{{
// TODO: add telephone number support // TODO: add telephone number support
list: function (filter, newMail) list: function (filter, newMail)
{ {
var addresses = []; let addresses = [];
var dirs = abManager.directories; let dirs = abManager.directories;
var lowerFilter = filter.toLowerCase(); let lowerFilter = filter.toLowerCase();
while (dirs.hasMoreElements()) while (dirs.hasMoreElements())
{ {
var addrbook = dirs.getNext().QueryInterface(Components.interfaces.nsIAbDirectory); let addrbook = dirs.getNext().QueryInterface(Components.interfaces.nsIAbDirectory);
var cards = addrbook.childCards; let cards = addrbook.childCards;
while (cards.hasMoreElements()) while (cards.hasMoreElements())
{ {
var card = cards.getNext().QueryInterface(Components.interfaces.nsIAbCard); let card = cards.getNext().QueryInterface(Components.interfaces.nsIAbCard);
var mail = card.primaryEmail || ""; //var mail = card.primaryEmail || ""; //XXX
var displayName = card.displayName; let displayName = card.displayName;
if (!displayName) if (!displayName)
displayName = generateDisplayName(card.firstName, card.lastName); displayName = generateDisplayName(card.firstName, card.lastName);
@@ -194,21 +189,21 @@ function Addressbook() //{{{
if (newMail) if (newMail)
{ {
// Now we have to create a new message // Now we have to create a new message
var args = {}; let args = {};
args.to = addresses.map( args.to = addresses.map(
function (address) "\"" + address[0].replace(/"/g, "") + " <" + address[1] + ">\"" function (address) "\"" + address[0].replace(/"/g, "") + " <" + address[1] + ">\""
).join(", "); ).join(", ");
liberator.mail.composeNewMail(args); mail.composeNewMail(args);
} }
else else
{ {
var list = ":" + util.escapeHTML(commandline.getCommand()) + "<br/>" + let list = ":" + util.escapeHTML(commandline.getCommand()) + "<br/>" +
"<table><tr class=\"hl-Title\" align=\"left\"><th>Name</th><th>Address</th></tr>"; "<table><tr class=\"hl-Title\" align=\"left\"><th>Name</th><th>Address</th></tr>";
for (let i = 0; i < addresses.length; i++) for (let i = 0; i < addresses.length; i++)
{ {
var displayName = util.escapeHTML(util.clip(addresses[i][0], 50)); let displayName = util.escapeHTML(util.clip(addresses[i][0], 50));
var mailAddr = util.escapeHTML(addresses[i][1]); let mailAddr = util.escapeHTML(addresses[i][1]);
list += "<tr><td>" + displayName + "</td><td style=\"width: 100%\"><a href=\"#\" class=\"hl-URL\">" + mailAddr + "</a></td></tr>"; list += "<tr><td>" + displayName + "</td><td style=\"width: 100%\"><a href=\"#\" class=\"hl-URL\">" + mailAddr + "</a></td></tr>";
} }
list += "</table>"; list += "</table>";

90
muttator/content/mail.js
View File

@@ -48,16 +48,16 @@ function Mail() //{{{
OnItemEvent: function (folder, event) OnItemEvent: function (folder, event)
{ {
var eventType = event.toString(); let eventType = event.toString();
if (eventType == "FolderLoaded") if (eventType == "FolderLoaded")
{ {
if (folder) if (folder)
{ {
var msgFolder = folder.QueryInterface(Components.interfaces.nsIMsgFolder); let msgFolder = folder.QueryInterface(Components.interfaces.nsIMsgFolder);
autocommands.trigger("FolderLoaded", { url: msgFolder }); autocommands.trigger("FolderLoaded", { url: msgFolder });
// Jump to a message when requested // Jump to a message when requested
var indices = []; let indices = [];
if (selectMessageKeys.length > 0) if (selectMessageKeys.length > 0)
{ {
for (let j = 0; j < selectMessageKeys.length; j++) for (let j = 0; j < selectMessageKeys.length; j++)
@@ -118,7 +118,7 @@ function Mail() //{{{
return false; return false;
} }
var folders = mail.getFolders(destinationFolder); let folders = mail.getFolders(destinationFolder);
if (folders.length == 0) if (folders.length == 0)
{ {
liberator.echoerr("E94: No matching folder for " + destinationFolder); liberator.echoerr("E94: No matching folder for " + destinationFolder);
@@ -130,7 +130,7 @@ function Mail() //{{{
return false; return false;
} }
var count = gDBView.selection.count; let count = gDBView.selection.count;
if (!count) if (!count)
{ {
liberator.beep(); liberator.beep();
@@ -152,12 +152,12 @@ function Mail() //{{{
function parentIndex(index) function parentIndex(index)
{ {
var parent = index; let parent = index;
var tree = GetThreadTree(); let tree = GetThreadTree();
while (true) while (true)
{ {
var tmp = tree.view.getParentIndex(parent); let tmp = tree.view.getParentIndex(parent);
if (tmp >= 0) if (tmp >= 0)
parent = tmp; parent = tmp;
else else
@@ -170,10 +170,10 @@ function Mail() //{{{
function selectUnreadFolder(backwards, count) function selectUnreadFolder(backwards, count)
{ {
count = (count > 0 ) ? count : 1; count = (count > 0 ) ? count : 1;
var direction = backwards ? -1 : 1; let direction = backwards ? -1 : 1;
var c = getCurrentFolderIndex(); let c = getCurrentFolderIndex();
var i = direction; let i = direction;
var folder; let folder;
while (count > 0 && (c + i) < gFolderTreeView.rowCount && (c + i) >= 0) while (count > 0 && (c + i) < gFolderTreeView.rowCount && (c + i) >= 0)
{ {
let resource = gFolderTreeView._rowMap[c+i]._folder; let resource = gFolderTreeView._rowMap[c+i]._folder;
@@ -315,7 +315,7 @@ function Mail() //{{{
{ {
try try
{ {
var author = gDBView.hdrForFirstSelectedMessage.mime2DecodedAuthor.toLowerCase(); let author = gDBView.hdrForFirstSelectedMessage.mime2DecodedAuthor.toLowerCase();
mail.selectMessage(function (msg) msg.mime2DecodedAuthor.toLowerCase().indexOf(author) == 0, true, true, false, count); mail.selectMessage(function (msg) msg.mime2DecodedAuthor.toLowerCase().indexOf(author) == 0, true, true, false, count);
} }
catch (e) { liberator.beep(); } catch (e) { liberator.beep(); }
@@ -328,7 +328,7 @@ function Mail() //{{{
{ {
try try
{ {
var author = gDBView.hdrForFirstSelectedMessage.mime2DecodedAuthor.toLowerCase(); let author = gDBView.hdrForFirstSelectedMessage.mime2DecodedAuthor.toLowerCase();
mail.selectMessage(function (msg) msg.mime2DecodedAuthor.toLowerCase().indexOf(author) == 0, true, true, true, count); mail.selectMessage(function (msg) msg.mime2DecodedAuthor.toLowerCase().indexOf(author) == 0, true, true, true, count);
} }
catch (e) { liberator.beep(); } catch (e) { liberator.beep(); }
@@ -346,7 +346,7 @@ function Mail() //{{{
{ {
try try
{ {
var to = escapeRecipient(gDBView.hdrForFirstSelectedMessage.mime2DecodedAuthor); let to = escapeRecipient(gDBView.hdrForFirstSelectedMessage.mime2DecodedAuthor);
commandline.open(":", "mail " + to + " -subject=", modes.EX); commandline.open(":", "mail " + to + " -subject=", modes.EX);
} }
catch (e) catch (e)
@@ -463,7 +463,7 @@ function Mail() //{{{
"Go to inbox", "Go to inbox",
function (count) function (count)
{ {
var folder = mail.getFolders("Inbox", false, true)[(count > 0) ? (count - 1) : 0]; let folder = mail.getFolders("Inbox", false, true)[(count > 0) ? (count - 1) : 0];
if (folder) if (folder)
SelectFolder(folder.URI); SelectFolder(folder.URI);
else else
@@ -605,7 +605,7 @@ function Mail() //{{{
"Toggle displayed headers", "Toggle displayed headers",
function () function ()
{ {
var value = gPrefBranch.getIntPref("mail.show_headers", 2); let value = gPrefBranch.getIntPref("mail.show_headers", 2);
gPrefBranch.setIntPref("mail.show_headers", value == 2 ? 1 : 2); gPrefBranch.setIntPref("mail.show_headers", value == 2 ? 1 : 2);
ReloadMessage(); ReloadMessage();
}); });
@@ -625,7 +625,7 @@ function Mail() //{{{
{ {
try try
{ {
var subject = gDBView.hdrForFirstSelectedMessage.mime2DecodedSubject; let subject = gDBView.hdrForFirstSelectedMessage.mime2DecodedSubject;
util.copyToClipboard(subject, true); util.copyToClipboard(subject, true);
} }
catch (e) { liberator.beep(); } catch (e) { liberator.beep(); }
@@ -674,7 +674,7 @@ function Mail() //{{{
args = args.string || "Inbox"; args = args.string || "Inbox";
count = count > 0 ? (count - 1) : 0; count = count > 0 ? (count - 1) : 0;
var folder = mail.getFolders(args, true, true)[count]; let folder = mail.getFolders(args, true, true)[count];
if (!folder) if (!folder)
liberator.echoerr("Folder \"" + args + "\" does not exist"); liberator.echoerr("Folder \"" + args + "\" does not exist");
else if (liberator.forceNewTab) else if (liberator.forceNewTab)
@@ -691,7 +691,7 @@ function Mail() //{{{
"Write a new message", "Write a new message",
function (args) function (args)
{ {
var mailargs = {}; let mailargs = {};
mailargs.to = args.join(", "); mailargs.to = args.join(", ");
mailargs.subject = args["-subject"]; mailargs.subject = args["-subject"];
mailargs.bcc = args["-bcc"]; mailargs.bcc = args["-bcc"];
@@ -699,7 +699,7 @@ function Mail() //{{{
mailargs.body = args["-text"]; mailargs.body = args["-text"];
mailargs.attachments = args["-attachment"] || []; mailargs.attachments = args["-attachment"] || [];
var addresses = args; let addresses = args;
if (mailargs.bcc) if (mailargs.bcc)
addresses = addresses.concat(mailargs.bcc); addresses = addresses.concat(mailargs.bcc);
if (mailargs.cc) if (mailargs.cc)
@@ -757,7 +757,7 @@ function Mail() //{{{
composeNewMail: function (args) composeNewMail: function (args)
{ {
var params = Components.classes["@mozilla.org/messengercompose/composeparams;1"] let params = Components.classes["@mozilla.org/messengercompose/composeparams;1"]
.createInstance(Components.interfaces.nsIMsgComposeParams); .createInstance(Components.interfaces.nsIMsgComposeParams);
params.composeFields = Components.classes["@mozilla.org/messengercompose/composefields;1"] params.composeFields = Components.classes["@mozilla.org/messengercompose/composefields;1"]
.createInstance(Components.interfaces.nsIMsgCompFields); .createInstance(Components.interfaces.nsIMsgCompFields);
@@ -783,8 +783,8 @@ function Mail() //{{{
{ {
while (args.attachments.length > 0) while (args.attachments.length > 0)
{ {
var url = args.attachments.pop(); let url = args.attachments.pop();
var file = io.getFile(url); let file = io.getFile(url);
if (!file.exists()) if (!file.exists())
return void liberator.echoerr("Exxx: Could not attach file `" + url + "'", commandline.FORCE_SINGLELINE); return void liberator.echoerr("Exxx: Could not attach file `" + url + "'", commandline.FORCE_SINGLELINE);
@@ -798,7 +798,7 @@ function Mail() //{{{
params.type = Components.interfaces.nsIMsgCompType.New; params.type = Components.interfaces.nsIMsgCompType.New;
var msgComposeService = Components.classes["@mozilla.org/messengercompose;1"].getService(); const msgComposeService = Components.classes["@mozilla.org/messengercompose;1"].getService();
msgComposeService = msgComposeService.QueryInterface(Components.interfaces.nsIMsgComposeService); msgComposeService = msgComposeService.QueryInterface(Components.interfaces.nsIMsgComposeService);
msgComposeService.OpenComposeWindowWithParams(null, params); msgComposeService.OpenComposeWindowWithParams(null, params);
}, },
@@ -806,7 +806,7 @@ function Mail() //{{{
// returns an array of nsIMsgFolder objects // returns an array of nsIMsgFolder objects
getFolders: function (filter, includeServers, includeMsgFolders) getFolders: function (filter, includeServers, includeMsgFolders)
{ {
var folders = []; let folders = [];
if (!filter) if (!filter)
filter = ""; filter = "";
else else
@@ -823,7 +823,7 @@ function Mail() //{{{
if ((resource.isServer && !includeServers) || (!resource.isServer && !includeMsgFolders)) if ((resource.isServer && !includeServers) || (!resource.isServer && !includeMsgFolders))
continue; continue;
var folderString = resource.server.prettyName + ": " + resource.name; let folderString = resource.server.prettyName + ": " + resource.name;
if (resource.prettiestName.toLowerCase().indexOf(filter) >= 0) if (resource.prettiestName.toLowerCase().indexOf(filter) >= 0)
folders.push(resource); folders.push(resource);
@@ -843,13 +843,13 @@ function Mail() //{{{
getStatistics: function (currentAccountOnly) getStatistics: function (currentAccountOnly)
{ {
var accounts = currentAccountOnly ? [this.currentAccount] let accounts = currentAccountOnly ? [this.currentAccount]
: this.getFolders("", true, false); : this.getFolders("", true, false);
var unreadCount = 0, totalCount = 0, newCount = 0; let unreadCount = 0, totalCount = 0, newCount = 0;
for (let i = 0; i < accounts.length; i++) for (let i = 0; i < accounts.length; i++)
{ {
var account = accounts[i]; let account = accounts[i];
unreadCount += account.getNumUnread(true); // true == deep (includes subfolders) unreadCount += account.getNumUnread(true); // true == deep (includes subfolders)
totalCount += account.getTotalMessages(true); totalCount += account.getTotalMessages(true);
newCount += account.getNumUnread(true); newCount += account.getNumUnread(true);
@@ -860,10 +860,10 @@ function Mail() //{{{
collapseThread: function () collapseThread: function ()
{ {
var tree = GetThreadTree(); let tree = GetThreadTree();
if (tree) if (tree)
{ {
var parent = parentIndex(tree.currentIndex); let parent = parentIndex(tree.currentIndex);
if (tree.changeOpenState(parent, false)) if (tree.changeOpenState(parent, false))
{ {
tree.view.selection.select(parent); tree.view.selection.select(parent);
@@ -876,10 +876,10 @@ function Mail() //{{{
expandThread: function () expandThread: function ()
{ {
var tree = GetThreadTree(); let tree = GetThreadTree();
if (tree) if (tree)
{ {
var row = tree.currentIndex; let row = tree.currentIndex;
if (row >= 0 && tree.changeOpenState(row, true)) if (row >= 0 && tree.changeOpenState(row, true))
return true; return true;
} }
@@ -898,7 +898,7 @@ function Mail() //{{{
{ {
function currentIndex() function currentIndex()
{ {
var index = gDBView.selection.currentIndex; let index = gDBView.selection.currentIndex;
if (index < 0) if (index < 0)
index = 0; index = 0;
return index; return index;
@@ -926,14 +926,14 @@ function Mail() //{{{
reverse ? (i >= 0) : (i < gDBView.rowCount); reverse ? (i >= 0) : (i < gDBView.rowCount);
reverse ? i-- : i++) reverse ? i-- : i++)
{ {
var key = gDBView.getKeyAt(i); let key = gDBView.getKeyAt(i);
var msg = gDBView.db.GetMsgHdrForKey(key); let msg = gDBView.db.GetMsgHdrForKey(key);
// a closed thread // a closed thread
if (openThreads && closedThread(i)) if (openThreads && closedThread(i))
{ {
var thread = gDBView.db.GetThreadContainingMsgHdr(msg); let thread = gDBView.db.GetThreadContainingMsgHdr(msg);
var originalCount = count; let originalCount = count;
for (let j = (i == currentIndex() && !reverse) ? 1 : (reverse ? thread.numChildren - 1 : 0); for (let j = (i == currentIndex() && !reverse) ? 1 : (reverse ? thread.numChildren - 1 : 0);
reverse ? (j >= 0) : (j < thread.numChildren); reverse ? (j >= 0) : (j < thread.numChildren);
@@ -972,15 +972,15 @@ function Mail() //{{{
{ {
selectMessageReverse = reverse; selectMessageReverse = reverse;
var folders = this.getFolders("", true, true); let folders = this.getFolders("", true, true);
var ci = getCurrentFolderIndex(); let ci = getCurrentFolderIndex();
for (let i = 1; i < folders.length; i++) for (let i = 1; i < folders.length; i++)
{ {
let index = (i + ci) % folders.length; let index = (i + ci) % folders.length;
if (reverse) if (reverse)
index = folders.length - 1 - index; index = folders.length - 1 - index;
var folder = folders[index]; let folder = folders[index];
if (folder.isServer) if (folder.isServer)
continue; continue;
@@ -995,14 +995,14 @@ function Mail() //{{{
} }
catch (e) catch (e)
{ {
var msgs = folder.getMessages(msgWindow); // for older thunderbirds msgs = folder.getMessages(msgWindow); // for older thunderbirds
liberator.dump("WARNING: " + folder.prettyName + " failed to getMessages, trying old API"); liberator.dump("WARNING: " + folder.prettyName + " failed to getMessages, trying old API");
//continue; //continue;
} }
while (msgs.hasMoreElements()) while (msgs.hasMoreElements())
{ {
var msg = msgs.getNext().QueryInterface(Components.interfaces.nsIMsgDBHdr); let msg = msgs.getNext().QueryInterface(Components.interfaces.nsIMsgDBHdr);
if (validatorFunc(msg)) if (validatorFunc(msg))
{ {
count--; count--;
@@ -1026,7 +1026,7 @@ function Mail() //{{{
setHTML: function (value) setHTML: function (value)
{ {
var values = [[true, 1, gDisallow_classes_no_html], // plaintext let values = [[true, 1, gDisallow_classes_no_html], // plaintext
[false, 0, 0], // HTML [false, 0, 0], // HTML
[false, 3, gDisallow_classes_no_html]]; // sanitized/simple HTML [false, 3, gDisallow_classes_no_html]]; // sanitized/simple HTML