You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2016/11/16 15:38:35 UTC
incubator-ponymail git commit: if body is an array,
then the strings are joined with
Repository: incubator-ponymail
Updated Branches:
refs/heads/master 32e58eebc -> f676ca61a
if body is an array, then the strings are joined with <br/>
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/f676ca61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/f676ca61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/f676ca61
Branch: refs/heads/master
Commit: f676ca61a6a063be2d1f87153d1f97b59ba42cad
Parents: 32e58ee
Author: Sebb <se...@apache.org>
Authored: Wed Nov 16 15:38:13 2016 +0000
Committer: Sebb <se...@apache.org>
Committed: Wed Nov 16 15:38:13 2016 +0000
----------------------------------------------------------------------
site/js/dev/ponymail_dom_helpers.js | 4 ++++
site/js/ponymail.js | 4 ++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/f676ca61/site/js/dev/ponymail_dom_helpers.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_dom_helpers.js b/site/js/dev/ponymail_dom_helpers.js
index 0cd4b9f..44b995b 100644
--- a/site/js/dev/ponymail_dom_helpers.js
+++ b/site/js/dev/ponymail_dom_helpers.js
@@ -225,6 +225,7 @@ function setPopup(pid, close) {
// Pop-up message display thingy. Used for saying "email sent...I think!"
+// if body is an array, then the strings are joined with <br/>
function popup(title, body, timeout, pid, wloc) {
var obj = document.getElementById('popupper')
if (pid) {
@@ -236,6 +237,9 @@ function popup(title, body, timeout, pid, wloc) {
}
}
if (obj) {
+ if (isArray(body)) {
+ body = body.join('<br/>')
+ }
obj.innerHTML = ""
obj.style.display = 'block'
obj.innerHTML = "<h3>" + title + "</h3><p>" + body + "</p><p><a class='btn btn-success' href='javascript:void(0);' onclick='popup_close(\""+(wloc?wloc:'')+"\")'>Got it!</a></p>"
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/f676ca61/site/js/ponymail.js
----------------------------------------------------------------------
diff --git a/site/js/ponymail.js b/site/js/ponymail.js
index 909bc10..53bfb26 100644
--- a/site/js/ponymail.js
+++ b/site/js/ponymail.js
@@ -1321,6 +1321,7 @@ function setPopup(pid, close) {
// Pop-up message display thingy. Used for saying "email sent...I think!"
+// if body is an array, then the strings are joined with <br/>
function popup(title, body, timeout, pid, wloc) {
var obj = document.getElementById('popupper')
if (pid) {
@@ -1332,6 +1333,9 @@ function popup(title, body, timeout, pid, wloc) {
}
}
if (obj) {
+ if (isArray(body)) {
+ body = body.join('<br/>')
+ }
obj.innerHTML = ""
obj.style.display = 'block'
obj.innerHTML = "<h3>" + title + "</h3><p>" + body + "</p><p><a class='btn btn-success' href='javascript:void(0);' onclick='popup_close(\""+(wloc?wloc:'')+"\")'>Got it!</a></p>"