ponymail-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From humbed...@apache.org
Subject [1/2] incubator-ponymail git commit: add some null checks for a search.html feature
Date Tue, 31 May 2016 12:13:19 GMT
Repository: incubator-ponymail
Updated Branches:
  refs/heads/master a8a62f67d -> 0f9e5261c


add some null checks for a search.html feature


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

Branch: refs/heads/master
Commit: 035de78917c43d5d2a9c460c29799de8dcda718e
Parents: a8a62f6
Author: humbedooh <humbedooh@apache.org>
Authored: Tue May 31 14:11:45 2016 +0200
Committer: humbedooh <humbedooh@apache.org>
Committed: Tue May 31 14:11:45 2016 +0200

----------------------------------------------------------------------
 site/js/dev/ponymail_pagebuilder.js | 6 +++++-
 site/js/ponymail.js                 | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/035de789/site/js/dev/ponymail_pagebuilder.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_pagebuilder.js b/site/js/dev/ponymail_pagebuilder.js
index 5723043..56a8188 100644
--- a/site/js/dev/ponymail_pagebuilder.js
+++ b/site/js/dev/ponymail_pagebuilder.js
@@ -371,7 +371,7 @@ function getListInfo(list, xdomain, nopush) {
             }
         }
     }
-    if (xdomain == undefined || xdomain == "" && list) {
+    if ((xdomain == undefined || xdomain == "") && list) {
         xdomain = list.replace(/^.*?@/, "")
         
     }
@@ -415,6 +415,10 @@ function getListInfo(list, xdomain, nopush) {
     }
 
     //buildCalendar()
+    // Bail if no list is still found - search.html probably
+    if (!list) {
+        return
+    }
     mbox_month = null;
     var dp = document.getElementById('d')
     dp.value = datePickerValue(current_retention)

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/035de789/site/js/ponymail.js
----------------------------------------------------------------------
diff --git a/site/js/ponymail.js b/site/js/ponymail.js
index 3528b58..8bfb63c 100644
--- a/site/js/ponymail.js
+++ b/site/js/ponymail.js
@@ -3922,7 +3922,7 @@ function getListInfo(list, xdomain, nopush) {
             }
         }
     }
-    if (xdomain == undefined || xdomain == "" && list) {
+    if ((xdomain == undefined || xdomain == "") && list) {
         xdomain = list.replace(/^.*?@/, "")
         
     }
@@ -3966,6 +3966,10 @@ function getListInfo(list, xdomain, nopush) {
     }
 
     //buildCalendar()
+    // Bail if no list is still found - search.html probably
+    if (!list) {
+        return
+    }
     mbox_month = null;
     var dp = document.getElementById('d')
     dp.value = datePickerValue(current_retention)


Mime
View raw message