Compare commits
3 Commits
fdcf493478
...
2b99cfa1ab
| Author | SHA1 | Date | |
|---|---|---|---|
| 2b99cfa1ab | |||
| 4ae3077173 | |||
| 10c20193a6 |
+51
-2
@@ -16,6 +16,15 @@ fn address_is_valid(addr: &str) -> bool {
|
||||
!addr.is_empty() && !addr.contains(':')
|
||||
}
|
||||
|
||||
fn split_host_port(input: &str) -> (String, Option<String>) {
|
||||
if let Some((host, port)) = input.rsplit_once(':') {
|
||||
if !port.is_empty() && port.chars().all(|c| c.is_ascii_digit()) {
|
||||
return (host.to_string(), Some(port.to_string()));
|
||||
}
|
||||
}
|
||||
(input.to_string(), None)
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, PartialEq, Eq)]
|
||||
pub enum UserIcon {
|
||||
Normal,
|
||||
@@ -816,6 +825,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
||||
.unwrap_or_default()
|
||||
});
|
||||
let mut password = use_signal(|| String::new());
|
||||
let mut address_paste_pending = use_signal(|| false);
|
||||
|
||||
let do_save = move |_| {
|
||||
let port_num: u16 = port.read().parse().unwrap_or(64738);
|
||||
@@ -866,7 +876,26 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
||||
placeholder: "mumble.example.com",
|
||||
pattern: ADDRESS_PATTERN,
|
||||
value: "{address.read()}",
|
||||
oninput: move |evt| address.set(evt.value().clone()),
|
||||
onpaste: move |_| address_paste_pending.set(true),
|
||||
oninput: move |evt| {
|
||||
if address_paste_pending() {
|
||||
address_paste_pending.set(false);
|
||||
let (host, maybe_port) = split_host_port(&evt.value());
|
||||
address.set(host);
|
||||
if let Some(p) = maybe_port {
|
||||
port.set(p);
|
||||
}
|
||||
} else {
|
||||
address.set(evt.value());
|
||||
}
|
||||
},
|
||||
onblur: move |_| {
|
||||
let (host, maybe_port) = split_host_port(&address.read());
|
||||
if let Some(p) = maybe_port {
|
||||
address.set(host);
|
||||
port.set(p);
|
||||
}
|
||||
},
|
||||
required: true,
|
||||
}
|
||||
div {
|
||||
@@ -945,6 +974,7 @@ fn EditServerModal(
|
||||
let mut port = use_signal(|| entry.port.to_string());
|
||||
let mut username = use_signal(|| entry.username.clone());
|
||||
let mut password = use_signal(|| entry.password.clone().unwrap_or_default());
|
||||
let mut address_paste_pending = use_signal(|| false);
|
||||
|
||||
let do_save = move |_| {
|
||||
let port_num: u16 = port.read().parse().unwrap_or(64738);
|
||||
@@ -995,7 +1025,26 @@ fn EditServerModal(
|
||||
placeholder: "mumble.example.com",
|
||||
pattern: ADDRESS_PATTERN,
|
||||
value: "{address.read()}",
|
||||
oninput: move |evt| address.set(evt.value().clone()),
|
||||
onpaste: move |_| address_paste_pending.set(true),
|
||||
oninput: move |evt| {
|
||||
if address_paste_pending() {
|
||||
address_paste_pending.set(false);
|
||||
let (host, maybe_port) = split_host_port(&evt.value());
|
||||
address.set(host);
|
||||
if let Some(p) = maybe_port {
|
||||
port.set(p);
|
||||
}
|
||||
} else {
|
||||
address.set(evt.value());
|
||||
}
|
||||
},
|
||||
onblur: move |_| {
|
||||
let (host, maybe_port) = split_host_port(&address.read());
|
||||
if let Some(p) = maybe_port {
|
||||
address.set(host);
|
||||
port.set(p);
|
||||
}
|
||||
},
|
||||
required: true,
|
||||
}
|
||||
div {
|
||||
|
||||
Reference in New Issue
Block a user