aboutsummaryrefslogtreecommitdiffhomepage
path: root/main/app/sprinkles/account/assets
diff options
context:
space:
mode:
authorMarvin Borner2018-05-23 22:23:28 +0200
committerMarvin Borner2018-05-23 22:23:28 +0200
commitb66a61addb6c8e66cb26fcf74b532d68891267e4 (patch)
tree05e9449ff25bdc98f68105f41923ccb9f6ef5095 /main/app/sprinkles/account/assets
parent1d4ef435177a5f9b6d1a289800d933e49be0c550 (diff)
Refactored code, many fixes and improvements in chat backend+frontend
Diffstat (limited to 'main/app/sprinkles/account/assets')
-rw-r--r--main/app/sprinkles/account/assets/userfrosting/js/pages/account-settings.js6
-rw-r--r--main/app/sprinkles/account/assets/userfrosting/js/pages/forgot-password.js4
-rw-r--r--main/app/sprinkles/account/assets/userfrosting/js/pages/resend-verification.js4
-rw-r--r--main/app/sprinkles/account/assets/userfrosting/js/pages/set-or-reset-password.js4
-rw-r--r--main/app/sprinkles/account/assets/userfrosting/js/pages/sign-in.js6
5 files changed, 12 insertions, 12 deletions
diff --git a/main/app/sprinkles/account/assets/userfrosting/js/pages/account-settings.js b/main/app/sprinkles/account/assets/userfrosting/js/pages/account-settings.js
index 8d8d2e7..ed75c7b 100644
--- a/main/app/sprinkles/account/assets/userfrosting/js/pages/account-settings.js
+++ b/main/app/sprinkles/account/assets/userfrosting/js/pages/account-settings.js
@@ -6,7 +6,7 @@
*
* Target page: account/settings
*/
-$(document).ready(function() {
+$(document).ready(function () {
// Apply select2 to locale field
$('.js-select2').select2();
@@ -14,7 +14,7 @@ $(document).ready(function() {
$("#account-settings").ufForm({
validators: page.validators.account_settings,
msgTarget: $("#alerts-page")
- }).on("submitSuccess.ufForm", function() {
+ }).on("submitSuccess.ufForm", function () {
// Reload the page on success
window.location.reload();
});
@@ -22,7 +22,7 @@ $(document).ready(function() {
$("#profile-settings").ufForm({
validators: page.validators.profile_settings,
msgTarget: $("#alerts-page")
- }).on("submitSuccess.ufForm", function() {
+ }).on("submitSuccess.ufForm", function () {
// Reload the page on success
window.location.reload();
});
diff --git a/main/app/sprinkles/account/assets/userfrosting/js/pages/forgot-password.js b/main/app/sprinkles/account/assets/userfrosting/js/pages/forgot-password.js
index 3f24311..962bf4c 100644
--- a/main/app/sprinkles/account/assets/userfrosting/js/pages/forgot-password.js
+++ b/main/app/sprinkles/account/assets/userfrosting/js/pages/forgot-password.js
@@ -6,13 +6,13 @@
*
* Target page: account/forgot-password
*/
-$(document).ready(function() {
+$(document).ready(function () {
// TODO: Process form
$("#request-password-reset").ufForm({
validators: page.validators.forgot_password,
msgTarget: $("#alerts-page")
- }).on("submitSuccess.ufForm", function() {
+ }).on("submitSuccess.ufForm", function () {
// Forward to login page on success
window.location.replace(site.uri.public + "/account/sign-in");
});
diff --git a/main/app/sprinkles/account/assets/userfrosting/js/pages/resend-verification.js b/main/app/sprinkles/account/assets/userfrosting/js/pages/resend-verification.js
index 5c3eaf8..3e9eea1 100644
--- a/main/app/sprinkles/account/assets/userfrosting/js/pages/resend-verification.js
+++ b/main/app/sprinkles/account/assets/userfrosting/js/pages/resend-verification.js
@@ -6,13 +6,13 @@
*
* Target page: account/resend-verification
*/
-$(document).ready(function() {
+$(document).ready(function () {
// TODO: Process form
$("#request-verification-email").ufForm({
validators: page.validators.resend_verification,
msgTarget: $("#alerts-page")
- }).on("submitSuccess.ufForm", function() {
+ }).on("submitSuccess.ufForm", function () {
// Forward to login page on success
window.location.replace(site.uri.public + "/account/sign-in");
});
diff --git a/main/app/sprinkles/account/assets/userfrosting/js/pages/set-or-reset-password.js b/main/app/sprinkles/account/assets/userfrosting/js/pages/set-or-reset-password.js
index 39cfd16..5e60bb1 100644
--- a/main/app/sprinkles/account/assets/userfrosting/js/pages/set-or-reset-password.js
+++ b/main/app/sprinkles/account/assets/userfrosting/js/pages/set-or-reset-password.js
@@ -6,12 +6,12 @@
*
* Target pages: account/set-password, account/reset-password
*/
-$(document).ready(function() {
+$(document).ready(function () {
$("#set-or-reset-password").ufForm({
validators: page.validators.set_password,
msgTarget: $("#alerts-page")
- }).on("submitSuccess.ufForm", function() {
+ }).on("submitSuccess.ufForm", function () {
// Forward to home page on success
// TODO: forward to landing/last page
window.location.replace(site.uri.public + "/account/sign-in");
diff --git a/main/app/sprinkles/account/assets/userfrosting/js/pages/sign-in.js b/main/app/sprinkles/account/assets/userfrosting/js/pages/sign-in.js
index 97f19e9..769a1b3 100644
--- a/main/app/sprinkles/account/assets/userfrosting/js/pages/sign-in.js
+++ b/main/app/sprinkles/account/assets/userfrosting/js/pages/sign-in.js
@@ -6,7 +6,7 @@
*
* Target page: account/sign-in
*/
-$(document).ready(function() {
+$(document).ready(function () {
/**
* If there is a redirect parameter in the query string, redirect to that page.
* Otherwise, if there is a UF-Redirect header, redirect to that page.
@@ -33,7 +33,7 @@ $(document).ready(function() {
$("#sign-in").ufForm({
validators: page.validators.login,
msgTarget: $("#alerts-page")
- }).on("submitSuccess.ufForm", function(event, data, textStatus, jqXHR) {
+ }).on("submitSuccess.ufForm", function (event, data, textStatus, jqXHR) {
if (localStorage.getItem("PrivateKey") === null && localStorage.getItem("🔒") === null) {
// GENERATE KEYS
var openpgp = window.openpgp;
@@ -59,7 +59,7 @@ $(document).ready(function() {
};
$.ajax({
type: 'POST',
- dataType : "json",
+ dataType: "json",
url: site.uri.public + '/api/users/u/' + $("input[name=user_name]").val() + '/publickey',
data: data,
async: false