From a81f7043fc44382775f9afac48e4c7a651e7ac6c Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 04 Jan 2026 18:29:10 +0000
Subject: [PATCH] =PopulateForm.js and ContentRoutes.php minor changes
---
assets/js/concise/UserSettings.js | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/assets/js/concise/UserSettings.js b/assets/js/concise/UserSettings.js
index 51763b0..9c9f2b0 100644
--- a/assets/js/concise/UserSettings.js
+++ b/assets/js/concise/UserSettings.js
@@ -6,7 +6,7 @@
this.debouncer = window.debouncer;
- this.isLoggedIn = jvbSettings.currentUser !== null;
+ this.isLoggedIn = window.auth.getUser() !== null;
this.initListeners();
this.loadSettings();
@@ -103,11 +103,11 @@
return;
}
const headers = {
- 'X-WP-Nonce': jvbSettings?.nonce,
+ 'X-WP-Nonce': window.auth.getNonce(),
'Content-Type': 'application/json'
};
const body = {
- user: jvbSettings.currentUser,
+ user: window.auth.getUser(),
setting: name,
value: value
};
@@ -152,8 +152,12 @@
}
}
-document.addEventListener('DOMContentLoaded', function() {
- window.jvbUserSettings = new UserSettings();
+document.addEventListener('DOMContentLoaded', async function() {
+ window.auth.subscribe((event) => {
+ if (event === 'auth-loaded') {
+ window.jvbUserSettings = new UserSettings();
+ }
+ });
});
//
// // Theme switching functionality
@@ -182,18 +186,18 @@
// localStorage.setItem('theme', isDark ? 'dark' : 'light');
//
// // If user is logged in, save preference
-// if (jvbSettings.currentUser !== null) {
+// if (window.auth.getUser() !== null) {
// try {
// await fetch(`${jvbSettings.api}settings`, {
// method: 'POST',
// headers: {
// 'Content-Type': 'application/json',
-// 'X-WP-Nonce': jvbSettings.nonce,
-// 'action_nonce': jvbSettings.dash,
+// 'X-WP-Nonce': window.auth.getNonce(),
+// 'action_nonce': window.auth.getNonce('dash'),
// },
// body: JSON.stringify({
// dark_mode: isDark,
-// user: jvbSettings.currentUser
+// user: window.auth.getUser()
// })
// });
// } catch (error) {
--
Gitblit v1.10.0