Address @sam
Build Mumble Web 2 / linux_build (push) Successful in 1m25s
Build Mumble Web 2 / windows_build (push) Successful in 2m24s

This commit is contained in:
2026-01-10 16:19:24 -07:00
parent a7c307959c
commit f2474591cb
3 changed files with 11 additions and 3 deletions
+1 -1
View File
@@ -558,7 +558,7 @@ pub fn LoginView(config: Resource<ClientConfig>) -> Element {
} }
}); });
let mut address_input = use_signal(|| None::<String>); let mut address_input = use_signal(|| imp::load_server_url());
let address = use_memo(move || { let address = use_memo(move || {
if let Some(addr) = address_input() { if let Some(addr) = address_input() {
addr.clone() addr.clone()
+6 -2
View File
@@ -361,10 +361,14 @@ pub fn load_username() -> Option<String> {
config.get("username").cloned() config.get("username").cloned()
} }
pub async fn load_config() -> color_eyre::Result<ClientConfig> { pub fn load_server_url() -> Option<String> {
let config = load_config_map(); let config = load_config_map();
config.get("server").cloned()
}
pub async fn load_config() -> color_eyre::Result<ClientConfig> {
Ok(ClientConfig { Ok(ClientConfig {
proxy_url: config.get("server").cloned(), proxy_url: None,
cert_hash: None, cert_hash: None,
any_server: true, any_server: true,
}) })
+4
View File
@@ -412,6 +412,10 @@ pub fn load_username() -> Option<String> {
.ok()? .ok()?
} }
pub fn load_server_url() -> Option<String> {
None
}
pub fn absolute_url(path: &str) -> Result<Url, Error> { pub fn absolute_url(path: &str) -> Result<Url, Error> {
let window: web_sys::Window = web_sys::window().expect("no global `window` exists"); let window: web_sys::Window = web_sys::window().expect("no global `window` exists");
let location = window.location(); let location = window.location();