ponymail-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject incubator-ponymail git commit: Revert "Ensure that a list isn't null when adding to favorites."
Date Sat, 19 Aug 2017 14:31:15 GMT
Repository: incubator-ponymail
Updated Branches:
  refs/heads/master 3821f702d -> 636ba7df5


Revert "Ensure that a list isn't null when adding to favorites."

This reverts commit be430c666bc220a52ffdcaa69e5a005836e22590.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/636ba7df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/636ba7df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/636ba7df

Branch: refs/heads/master
Commit: 636ba7df54eb60c9533733c2db178939c1095365
Parents: 3821f70
Author: Sebb <sebb@apache.org>
Authored: Sat Aug 19 15:30:19 2017 +0100
Committer: Sebb <sebb@apache.org>
Committed: Sat Aug 19 15:30:19 2017 +0100

----------------------------------------------------------------------
 site/js/dev/ponymail_phonebook.js        |  4 +---
 site/js/dev/ponymail_user_preferences.js | 18 ++++++++----------
 site/js/ponymail.js                      | 22 +++++++++-------------
 3 files changed, 18 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/636ba7df/site/js/dev/ponymail_phonebook.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_phonebook.js b/site/js/dev/ponymail_phonebook.js
index 754c49f..9fc8365 100644
--- a/site/js/dev/ponymail_phonebook.js
+++ b/site/js/dev/ponymail_phonebook.js
@@ -111,9 +111,7 @@ function seedDomains(json) {
     if (login && login.favorites && login.favorites.length > 0) {
         domlist['★'] = []
         for (mli in login.favorites) {
-            if (mli != null) { // #392: ensure the list exists
-                domlist['★'].push(login.favorites[mli])
-            }
+            domlist['★'].push(login.favorites[mli])
         }
     }
     var po = document.createElement("div")

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/636ba7df/site/js/dev/ponymail_user_preferences.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_user_preferences.js b/site/js/dev/ponymail_user_preferences.js
index 2f1ff46..7d0e2f8 100644
--- a/site/js/dev/ponymail_user_preferences.js
+++ b/site/js/dev/ponymail_user_preferences.js
@@ -218,16 +218,14 @@ function setupUser() {
         li.appendChild(ul)
         for (var i in login.favorites) {
             var l = login.favorites[i]
-            if (l != null) {
-                var sli = document.createElement('li')
-                sli.setAttribute("class", "pull-left")
-                var st = document.createTextNode(l)
-                var sa = document.createElement('a')
-                sa.setAttribute("href", "list.html?" + l)
-                sa.appendChild(st)
-                sli.appendChild(sa)
-                ul.appendChild(sli)
-            }
+            var sli = document.createElement('li')
+            sli.setAttribute("class", "pull-left")
+            var st = document.createTextNode(l)
+            var sa = document.createElement('a')
+            sa.setAttribute("href", "list.html?" + l)
+            sa.appendChild(st)
+            sli.appendChild(sa)
+            ul.appendChild(sli)
         }
         
         pd.appendChild(li)

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/636ba7df/site/js/ponymail.js
----------------------------------------------------------------------
diff --git a/site/js/ponymail.js b/site/js/ponymail.js
index 689bc8e..9aa2310 100644
--- a/site/js/ponymail.js
+++ b/site/js/ponymail.js
@@ -4310,9 +4310,7 @@ function seedDomains(json) {
     if (login && login.favorites && login.favorites.length > 0) {
         domlist['★'] = []
         for (mli in login.favorites) {
-            if (mli != null) { // #392: ensure the list exists
-                domlist['★'].push(login.favorites[mli])
-            }
+            domlist['★'].push(login.favorites[mli])
         }
     }
     var po = document.createElement("div")
@@ -5315,16 +5313,14 @@ function setupUser() {
         li.appendChild(ul)
         for (var i in login.favorites) {
             var l = login.favorites[i]
-            if (l != null) {
-                var sli = document.createElement('li')
-                sli.setAttribute("class", "pull-left")
-                var st = document.createTextNode(l)
-                var sa = document.createElement('a')
-                sa.setAttribute("href", "list.html?" + l)
-                sa.appendChild(st)
-                sli.appendChild(sa)
-                ul.appendChild(sli)
-            }
+            var sli = document.createElement('li')
+            sli.setAttribute("class", "pull-left")
+            var st = document.createTextNode(l)
+            var sa = document.createElement('a')
+            sa.setAttribute("href", "list.html?" + l)
+            sa.appendChild(st)
+            sli.appendChild(sa)
+            ul.appendChild(sli)
         }
         
         pd.appendChild(li)


Mime
View raw message