Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4B97E200CE9 for ; Sat, 19 Aug 2017 16:31:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4A236164F91; Sat, 19 Aug 2017 14:31:21 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 66325164F90 for ; Sat, 19 Aug 2017 16:31:20 +0200 (CEST) Received: (qmail 56710 invoked by uid 500); 19 Aug 2017 14:31:18 -0000 Mailing-List: contact commits-help@ponymail.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ponymail.incubator.apache.org Delivered-To: mailing list commits@ponymail.incubator.apache.org Received: (qmail 56701 invoked by uid 99); 19 Aug 2017 14:31:18 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Aug 2017 14:31:18 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 56E98C1979 for ; Sat, 19 Aug 2017 14:31:18 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id uSbtYsTEAwgx for ; Sat, 19 Aug 2017 14:31:17 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 28CA75F1B3 for ; Sat, 19 Aug 2017 14:31:17 +0000 (UTC) Received: (qmail 56672 invoked by uid 99); 19 Aug 2017 14:31:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Aug 2017 14:31:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D0A72E0394; Sat, 19 Aug 2017 14:31:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: sebb@apache.org To: commits@ponymail.incubator.apache.org Message-Id: <38f723b6d5024cc59ba1c2489fee89dd@git.apache.org> X-Mailer: ASF-Git Admin Mailer 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 +0000 (UTC) archived-at: Sat, 19 Aug 2017 14:31:21 -0000 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 Authored: Sat Aug 19 15:30:19 2017 +0100 Committer: Sebb 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)