Changeset f440ee

Timestamp:

Apr 5, 2017, 3:57:40 PM (6 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

647573

Parents:

3819a1

Message:

expression closures are deprecated

File:

• modules/stdlib/msgHdrUtils.js (modified) (17 diffs)

modules/stdlib/msgHdrUtils.js

@@ -86 +86 @@
  * @return {String}
  */
-function msgHdrGetUri(aMsg)
-aMsg.folder.getUriForMsg(aMsg)
+function msgHdrGetUri(aMsg) {
+    return aMsg.folder.getUriForMsg(aMsg);
+}
 
 /**
@@ -109 +110 @@
  * @return {bool}
  */
-function msgHdrIsInbox(msgHdr)
-msgHdr.folder.getFlag(nsMsgFolderFlags_Inbox)
+function msgHdrIsInbox(msgHdr) {
+    return msgHdr.folder.getFlag(nsMsgFolderFlags_Inbox);
+}
 
 /**
@@ -117 +119 @@
  * @return {bool}
  */
-function msgHdrIsDraft(msgHdr)
-msgHdr.folder.getFlag(nsMsgFolderFlags_Drafts)
+function msgHdrIsDraft(msgHdr) {
+    return msgHdr.folder.getFlag(nsMsgFolderFlags_Drafts);
+}
 
 /**
@@ -125 +128 @@
  * @return {bool}
  */
-function msgHdrIsSent(msgHdr)
-msgHdr.folder.getFlag(nsMsgFolderFlags_SentMail)
+function msgHdrIsSent(msgHdr) {
+    return msgHdr.folder.getFlag(nsMsgFolderFlags_SentMail);
+}
 
 /**
@@ -133 +137 @@
  * @return {bool}
  */
-function msgHdrIsArchive(msgHdr)
-msgHdr.folder.getFlag(nsMsgFolderFlags_Archive)
+function msgHdrIsArchive(msgHdr) {
+    return msgHdr.folder.getFlag(nsMsgFolderFlags_Archive);
+}
 
 /**
@@ -141 +146 @@
  * @return {nsIMsgDbHdr} The message header.
  */
-function msgHdrFromNeckoUrl(aUrl)
-aUrl.QueryInterface(Ci.nsIMsgMessageUrl).messageHeader
+function msgHdrFromNeckoUrl(aUrl) {
+    return aUrl.QueryInterface(Ci.nsIMsgMessageUrl).messageHeader;
+}
 
 /**
@@ -214 +220 @@
   let oldTagList = msgHdrGetTags(aMsgHdr);
   let oldTags = {}; // hashmap
-  for each(let [, tag] in Iterator(oldTagList))
-  oldTags[tag.key] = null;
+  
+  oldTagList.map(tag => oldTags[tag.key] = null);
 
   let newTags = {};
   let newTagList = aTags;
-  for each(let [, tag] in Iterator(newTagList))
-  newTags[tag.key] = null;
+
+  newTagList.map(tag => newTags[tag.key] = null);
 
   let toAdd = newTagList.map(function(x) {if (!(x.key in oldTags)) return x.key});
@@ -240 +246 @@
 function msgHdrsMarkAsRead(msgHdrs, read) {
   let pending = {};
-  for each(let msgHdr in msgHdrs) {
+  
+  for (let msgHdr of Object.values(msgHdrs)) {
     if (msgHdr.isRead == read)
       continue;
@@ -251 +258 @@
     pending[msgHdr.folder.URI].msgs.appendElement(msgHdr, false);
   }
-  for each(let {
+  for (let {
     folder, msgs
-  } in pending) {
+  } of Object.values(pending)) {
     folder.markMessagesRead(msgs, read);
     folder.msgDatabase = null; /* don't leak */
@@ -265 +272 @@
 function msgHdrsDelete(msgHdrs) {
   let pending = {};
-  for each(let msgHdr in msgHdrs) {
+  for (let msgHdr of Object.values(msgHdrs)) {
     if (!pending[msgHdr.folder.URI]) {
       pending[msgHdr.folder.URI] = {
@@ -274 +281 @@
     pending[msgHdr.folder.URI].msgs.appendElement(msgHdr, false);
   }
-  for each(let {
+  for (let {
     folder, msgs
-  } in pending) {
+  } of Object.values(pending)) {
     folder.deleteMessages(msgs, getMail3Pane().msgWindow, false, false, null, true);
     folder.msgDatabase = null; /* don't leak */
@@ -307 +314 @@
   let batchMover = new mail3PaneWindow.BatchMessageMover();
   batchMover.archiveMessages(msgHdrs.filter(
-    function (x) !msgHdrIsArchive(x) && getMail3Pane().getIdentityForHeader(x).archiveEnabled
+    function (x) {
+        return !msgHdrIsArchive(x) && getMail3Pane().getIdentityForHeader(x).archiveEnabled;
+    }
   ));
 }
@@ -316 +325 @@
  * @return {Bool}
  */
-function msgHdrIsRss(msgHdr)
-  (msgHdr.folder.server instanceof Ci.nsIRssIncomingServer)
+function msgHdrIsRss(msgHdr) {
+  return (msgHdr.folder.server instanceof Ci.nsIRssIncomingServer);
+}
 
 /**
@@ -324 +334 @@
  * @return {Bool}
  */
-function msgHdrIsNntp(msgHdr)
-  (msgHdr.folder.server instanceof Ci.nsINntpIncomingServer)
+function msgHdrIsNntp(msgHdr) {
+  return (msgHdr.folder.server instanceof Ci.nsINntpIncomingServer);
+}
 
 /**
@@ -332 +343 @@
  * @return {Bool}
  */
-function msgHdrIsJunk(aMsgHdr)
-aMsgHdr.getStringProperty("junkscore") == Ci.nsIJunkMailPlugin.IS_SPAM_SCORE
+function msgHdrIsJunk(aMsgHdr) {
+    return aMsgHdr.getStringProperty("junkscore") == Ci.nsIJunkMailPlugin.IS_SPAM_SCORE;
+}
 
 /**
@@ -385 +397 @@
   let messageService = MailServices.messenger.messageServiceFromURI(uri);
 
-  let fallback = function ()
-  MsgHdrToMimeMessage(aMsgHdr, null, function (aMsgHdr, aMimeMsg) {
-    k(aMimeMsg);
-  }, true, {
-    partsOnDemand: true,
-  });
+  let fallback = function () {
+    return MsgHdrToMimeMessage(aMsgHdr, null, function (aMsgHdr, aMimeMsg) {
+        k(aMimeMsg);
+    }, true, {
+        partsOnDemand: true,
+    });
+  }
 
   // This is intentionally disabled because there's a bug in Thunderbird that
@@ -401 +414 @@
         let lines = str.split(/\r?\n/);
         let obj = {};
-        for each(let [, line] in Iterator(lines)) {
+        lines.map(function(line) {
           let i = line.indexOf(":");
-          if (i < 0)
-            continue;
-          let k = line.substring(0, i).toLowerCase();
-          let v = line.substring(i + 1).trim();
-          if (!(k in obj))
-            obj[k] = [];
-          obj[k].push(v);
-        }
+          if (i >= 0) {
+            let k = line.substring(0, i).toLowerCase();
+            let v = line.substring(i + 1).trim();
+            if (!(k in obj))
+                obj[k] = [];
+            obj[k].push(v);
+          }
+        });
         k(new HeaderHandler(obj));
       }), null, true);