diff --git a/content/addressbook.js b/content/addressbook.js index 985d36ef..418c241f 100644 --- a/content/addressbook.js +++ b/content/addressbook.js @@ -142,26 +142,26 @@ liberator.Addressbook = function () //{{{ return { - add: function (address, firstname, lastname, displayName) - { - var directory = getDirectoryFromURI(kPersonalAddressbookURI); - var card = Components.classes["@mozilla.org/addressbook/cardproperty;1"] - .createInstance(Components.interfaces.nsIAbCard); + add: function (address, firstname, lastname, displayName) + { + var directory = getDirectoryFromURI(kPersonalAddressbookURI); + var card = Components.classes["@mozilla.org/addressbook/cardproperty;1"] + .createInstance(Components.interfaces.nsIAbCard); - if (!address || !directory || !card) - return false; + if (!address || !directory || !card) + return false; - card.primaryEmail = address; - card.firstName = firstname; - card.lastName = lastname; - card.displayName = displayName; + card.primaryEmail = address; + card.firstName = firstname; + card.lastName = lastname; + card.displayName = displayName; - return directory.addCard(card); - }, + return directory.addCard(card); + }, // TODO: add telephone number support - list: function (filter, newMail) - { + list: function (filter, newMail) + { var addresses = []; var dirs = abManager.directories; var lowerFilter = filter.toLowerCase(); @@ -189,22 +189,22 @@ liberator.Addressbook = function () //{{{ return false; } - if (newMail) - { - // Now we have to create a new message - var args = {}; - args.to = addresses.map( + if (newMail) + { + // Now we have to create a new message + var args = {}; + args.to = addresses.map( function (address) "\"" + address[0].replace(/"/g, "") + " <" + address[1] + ">\"" ).join(", "); - liberator.mail.composeNewMail(args); - } - else - { - var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "
" + - ""; - for (let i = 0; i < addresses.length; i++) - { + liberator.mail.composeNewMail(args); + } + else + { + var list = ":" + liberator.util.escapeHTML(liberator.commandline.getCommand()) + "
" + + "
NameAddress
"; + for (let i = 0; i < addresses.length; i++) + { var displayName = liberator.util.escapeHTML(liberator.util.clip(addresses[i][0], 50)); var mailAddr = liberator.util.escapeHTML(addresses[i][1]); list += ""; diff --git a/content/completion.js b/content/completion.js index 26721d33..b73ef1ac 100644 --- a/content/completion.js +++ b/content/completion.js @@ -355,29 +355,29 @@ liberator.Completion = function () //{{{ if (!filter) return [0, []]; - var engineList = (engineAliases || liberator.options["suggestengines"]).split(","); - var responseType = "application/x-suggestions+json"; - var ss = Components.classes["@mozilla.org/browser/search-service;1"] - .getService(Components.interfaces.nsIBrowserSearchService); + var engineList = (engineAliases || liberator.options["suggestengines"]).split(","); + var responseType = "application/x-suggestions+json"; + var ss = Components.classes["@mozilla.org/browser/search-service;1"] + .getService(Components.interfaces.nsIBrowserSearchService); - var completions = []; - engineList.forEach(function (name) { - var query = filter; - var queryURI; - var engine = ss.getEngineByAlias(name); - var reg = new RegExp("^\s*(" + name + "\\s+)(.*)$"); - var matches = query.match(reg); - if (matches) - query = matches[2]; + var completions = []; + engineList.forEach(function (name) { + var query = filter; + var queryURI; + var engine = ss.getEngineByAlias(name); + var reg = new RegExp("^\s*(" + name + "\\s+)(.*)$"); + var matches = query.match(reg); + if (matches) + query = matches[2]; - if (engine && engine.supportsResponseType(responseType)) + if (engine && engine.supportsResponseType(responseType)) queryURI = engine.getSubmission(query, responseType).uri.asciiSpec; else return [0, []]; - var xhr = new XMLHttpRequest(); - xhr.open("GET", queryURI, false); - xhr.send(null); + var xhr = new XMLHttpRequest(); + xhr.open("GET", queryURI, false); + xhr.send(null); var json = Components.classes["@mozilla.org/dom/json;1"] .createInstance(Components.interfaces.nsIJSON); @@ -385,18 +385,18 @@ liberator.Completion = function () //{{{ if (!results) return [0, []]; - results.forEach(function (item) { + results.forEach(function (item) { // make sure we receive strings, otherwise a man-in-the-middle attack // could return objects which toString() method could be called to // execute untrusted code if (typeof item != "string") return [0, []]; - completions.push([(matches ? matches[1] : "") + item, engine.name + " suggestion"]); - }); - }); + completions.push([(matches ? matches[1] : "") + item, engine.name + " suggestion"]); + }); + }); - return [0, completions]; + return [0, completions]; }, stylesheet: function (filter) diff --git a/content/liberator.js b/content/liberator.js index 90b25221..fa91ea8d 100644 --- a/content/liberator.js +++ b/content/liberator.js @@ -1190,7 +1190,7 @@ const liberator = (function () //{{{ thread = Components.classes["@mozilla.org/thread-manager;1"].getService().newThread(0); // DISPATCH_SYNC is necessary, otherwise strange things will happen - thread.dispatch(new CallbackEvent(func, args), thread.DISPATCH_SYNC); + thread.dispatch(new CallbackEvent(func, args), thread.DISPATCH_SYNC); } }; diff --git a/content/mail.js b/content/mail.js index c17b9d10..2e169842 100644 --- a/content/mail.js +++ b/content/mail.js @@ -248,14 +248,14 @@ liberator.Mail = function () //{{{ function () { content.focus(); }); liberator.mappings.add(modes, ["I"], - "Open the message in new tab", - function () - { - if (gDBView && gDBView.selection.count < 1) - return liberator.beep(); + "Open the message in new tab", + function () + { + if (gDBView && gDBView.selection.count < 1) + return liberator.beep(); - MsgOpenNewTabForMessage(); - }); + MsgOpenNewTabForMessage(); + }); /*liberator.mappings.add([liberator.modes.NORMAL], ["o"], "Open a message", diff --git a/content/ui.js b/content/ui.js index 5057f67c..82b4575d 100644 --- a/content/ui.js +++ b/content/ui.js @@ -307,15 +307,15 @@ liberator.CommandLine = function () //{{{ "Engine Alias which has a feature of suggest", "stringlist", "google", { - validator: function (value) - { - var ss = Components.classes["@mozilla.org/browser/search-service;1"] - .getService(Components.interfaces.nsIBrowserSearchService); - return value.split(",").every(function (item) { - var e = ss.getEngineByAlias(item); - return (e && e.supportsResponseType("application/x-suggestions+json")) ? true : false; - }); - } + validator: function (value) + { + var ss = Components.classes["@mozilla.org/browser/search-service;1"] + .getService(Components.interfaces.nsIBrowserSearchService); + return value.split(",").every(function (item) { + var e = ss.getEngineByAlias(item); + return (e && e.supportsResponseType("application/x-suggestions+json")) ? true : false; + }); + } }); liberator.options.add(["showmode", "smd"],
NameAddress
" + displayName + "" + mailAddr + "