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 2017/01/07 17:18:21 UTC
incubator-ponymail git commit: absolute URLs must be prefixed with
URLBase in JS files
Repository: incubator-ponymail
Updated Branches:
refs/heads/master 6eac6ec0f -> 40bbaa51e
absolute URLs must be prefixed with URLBase in JS files
This fixes #327
Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/40bbaa51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/40bbaa51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/40bbaa51
Branch: refs/heads/master
Commit: 40bbaa51ee9953f037d1f31b5db072d453790410
Parents: 6eac6ec
Author: Sebb <se...@apache.org>
Authored: Sat Jan 7 17:18:11 2017 +0000
Committer: Sebb <se...@apache.org>
Committed: Sat Jan 7 17:18:11 2017 +0000
----------------------------------------------------------------------
CHANGELOG.md | 1 +
site/js/dev/ponymail_email_displays.js | 2 +-
site/js/dev/ponymail_pagebuilder.js | 4 ++--
site/js/ponymail.js | 6 +++---
4 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/40bbaa51/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a1b6e9..1bcc1ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -106,6 +106,7 @@
- pminfo.lua - scroll/scan ignores sort order (#322)
- flat view mode does not show first line of body (#198)
- Fetch URLBase once in Javascript
+- absolute URLs must be prefixed with URLBase in JS files (#327)
## CHANGES in 0.9b:
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/40bbaa51/site/js/dev/ponymail_email_displays.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_email_displays.js b/site/js/dev/ponymail_email_displays.js
index b491a97..f74a1ba 100644
--- a/site/js/dev/ponymail_email_displays.js
+++ b/site/js/dev/ponymail_email_displays.js
@@ -473,7 +473,7 @@ function displaySingleThread(json) {
popup("Email not found!",
["Sorry, it seems like we couldn't find this email for you.",
"It may be private and hidden for non-authenticated users.",
- "In which case you could <a href='/oauth.html'>Log in</a> and see if that helps."],
+ "In which case you could <a href='" + URL_BASE + "/oauth.html'>Log in</a> and see if that helps."],
60)
}
var mid = current_thread_json[0].mid.replace(/[<>]/g, "")
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/40bbaa51/site/js/dev/ponymail_pagebuilder.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_pagebuilder.js b/site/js/dev/ponymail_pagebuilder.js
index 7cddf36..4c6530f 100644
--- a/site/js/dev/ponymail_pagebuilder.js
+++ b/site/js/dev/ponymail_pagebuilder.js
@@ -392,7 +392,7 @@ function getListInfo(list, xdomain, nopush) {
// List may be private...who knows?
if ((list && list.length > 1) && (!login || !login.credentials)) {
- popup("List not found!", "Looks like this list is either not here or private.<br>You can try <a href='/oauth.html'>Logging in</a> to resolve the situation.")
+ popup("List not found!", "Looks like this list is either not here or private.<br>You can try <a href='" + URL_BASE + "/oauth.html'>Logging in</a> to resolve the situation.")
}
else {
if (listnames.length > 0 && xdomain) {
@@ -479,7 +479,7 @@ function getListInfo(list, xdomain, nopush) {
ll.appendChild(li)
if (typeof all_lists[xdomain][listname] == 'undefined') {
if ((list && list.length > 1) && (!login || !login.credentials)) {
- popup("List not found!", "Looks like this list is either not here or private.<br>You can try <a href='/oauth.html'>Logging in</a> to resolve the situation.")
+ popup("List not found!", "Looks like this list is either not here or private.<br>You can try <a href='" + URL_BASE + "/oauth.html'>Logging in</a> to resolve the situation.")
} else {
listname = key
list = ln
http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/40bbaa51/site/js/ponymail.js
----------------------------------------------------------------------
diff --git a/site/js/ponymail.js b/site/js/ponymail.js
index 38b663b..06fa08c 100644
--- a/site/js/ponymail.js
+++ b/site/js/ponymail.js
@@ -1830,7 +1830,7 @@ function displaySingleThread(json) {
popup("Email not found!",
["Sorry, it seems like we couldn't find this email for you.",
"It may be private and hidden for non-authenticated users.",
- "In which case you could <a href='/oauth.html'>Log in</a> and see if that helps."],
+ "In which case you could <a href='" + URL_BASE + "/oauth.html'>Log in</a> and see if that helps."],
60)
}
var mid = current_thread_json[0].mid.replace(/[<>]/g, "")
@@ -3989,7 +3989,7 @@ function getListInfo(list, xdomain, nopush) {
// List may be private...who knows?
if ((list && list.length > 1) && (!login || !login.credentials)) {
- popup("List not found!", "Looks like this list is either not here or private.<br>You can try <a href='/oauth.html'>Logging in</a> to resolve the situation.")
+ popup("List not found!", "Looks like this list is either not here or private.<br>You can try <a href='" + URL_BASE + "/oauth.html'>Logging in</a> to resolve the situation.")
}
else {
if (listnames.length > 0 && xdomain) {
@@ -4076,7 +4076,7 @@ function getListInfo(list, xdomain, nopush) {
ll.appendChild(li)
if (typeof all_lists[xdomain][listname] == 'undefined') {
if ((list && list.length > 1) && (!login || !login.credentials)) {
- popup("List not found!", "Looks like this list is either not here or private.<br>You can try <a href='/oauth.html'>Logging in</a> to resolve the situation.")
+ popup("List not found!", "Looks like this list is either not here or private.<br>You can try <a href='" + URL_BASE + "/oauth.html'>Logging in</a> to resolve the situation.")
} else {
listname = key
list = ln