You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by hu...@apache.org on 2020/09/07 11:46:41 UTC
[incubator-ponymail-foal] branch master updated (1d6b3fb -> e429982)
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git.
from 1d6b3fb Add some improvements to the httpd config example
new 254947e go back to whence we came if possible
new 4ccd5a4 Persona is no more
new e429982 override parent div click lock
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
webui/js/oauth.js | 27 +++++++++++++--------------
webui/js/ponymail.js | 2 +-
webui/js/source/preferences.js | 2 +-
3 files changed, 15 insertions(+), 16 deletions(-)
[incubator-ponymail-foal] 03/03: override parent div click lock
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit e4299825d623e47f7b657b744ad9ccd5fb564594
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Mon Sep 7 13:46:29 2020 +0200
override parent div click lock
---
webui/js/ponymail.js | 2 +-
webui/js/source/preferences.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 5e4ed34..48a1f59 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -2472,7 +2472,7 @@ function init_preferences(state, json) {
let eml = document.getElementById('emails');
eml.innerText = "We couldn't find this list. It may not exist or require you to be logged in with specific credentials.";
eml.inject(new HTML('br'));
- eml.inject(new HTML('a', {href: 'oauth.html'}, "Click here to log in via OAuth"));
+ eml.inject(new HTML('a', {href: 'oauth.html', onclick:'location.href="oauth.html";'}, "Click here to log in via OAuth"));
} else {
console.log(current_domain);
let first_list = Object.keys(json.lists[current_domain])[0];
diff --git a/webui/js/source/preferences.js b/webui/js/source/preferences.js
index 7e950ae..8445379 100644
--- a/webui/js/source/preferences.js
+++ b/webui/js/source/preferences.js
@@ -75,7 +75,7 @@ function init_preferences(state, json) {
let eml = document.getElementById('emails');
eml.innerText = "We couldn't find this list. It may not exist or require you to be logged in with specific credentials.";
eml.inject(new HTML('br'));
- eml.inject(new HTML('a', {href: 'oauth.html'}, "Click here to log in via OAuth"));
+ eml.inject(new HTML('a', {href: 'oauth.html', onclick:'location.href="oauth.html";'}, "Click here to log in via OAuth"));
} else {
console.log(current_domain);
let first_list = Object.keys(json.lists[current_domain])[0];
[incubator-ponymail-foal] 01/03: go back to whence we came if
possible
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 254947ef91494d550b2f040ba13e817f5f5164f0
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Mon Sep 7 13:45:36 2020 +0200
go back to whence we came if possible
---
webui/js/oauth.js | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/webui/js/oauth.js b/webui/js/oauth.js
index 2e3b80a..ea4101d 100644
--- a/webui/js/oauth.js
+++ b/webui/js/oauth.js
@@ -68,6 +68,16 @@ function oauthPortal(key) {
// page.
function parseOauthResponse(json) {
if (json.okay) {
+ console.log('Checking for origin URL');
+ if (window.sessionStorage) {
+ let url = window.sessionStorage.getItem('ponymail_oauth_origin');
+ console.log('Origin is ', url);
+ if (url && url.length > 0) {
+ location.href = url;
+ return
+ }
+ }
+ console.log("No origin found, defaulting to ./");
location.href = "./" // TODO: Return to whence we came...
} else {
popup("Oauth failed", "Authentication failed: " + json.msg)
@@ -96,7 +106,7 @@ function oauthOptions() {
oobj.appendChild(document.createElement('br'))
}
}
-
+
// Mozilla Persona
if (pm_config.persona.enabled) {
var img = document.createElement('img')
@@ -137,6 +147,7 @@ function oauthWelcome(args) {
}
// Not a callback, let's just show which oauth/persona options are enabled.
} else {
- oauthOptions()
+ oauthOptions();
+ window.sessionStorage.setItem('ponymail_oauth_origin', document.referrer);
}
}
\ No newline at end of file
[incubator-ponymail-foal] 02/03: Persona is no more
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 4ccd5a4402023362254f365f645ff6b9efd49526
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Mon Sep 7 13:45:46 2020 +0200
Persona is no more
---
webui/js/oauth.js | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/webui/js/oauth.js b/webui/js/oauth.js
index ea4101d..79b8a78 100644
--- a/webui/js/oauth.js
+++ b/webui/js/oauth.js
@@ -107,18 +107,6 @@ function oauthOptions() {
}
}
- // Mozilla Persona
- if (pm_config.persona.enabled) {
- var img = document.createElement('img')
- img.setAttribute("src", "images/persona.png")
- img.setAttribute("title", "Log on with persona")
- img.setAttribute("onclick", "navigator.id.request();")
- img.style.cursor = "pointer"
- oobj.appendChild(img)
- oobj.appendChild(document.createElement('br'))
- oobj.appendChild(document.createTextNode(' '))
- oobj.appendChild(document.createElement('br'))
- }
}
// onLoad function for oauth. If args (query string or bookmark) are supplied,