stephenseo/EN605.607.81.SP22_ASDM_Project
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

front-end: Minor refactorings

Browse source
This commit is contained in:
Stephen Seo 2022-04-29 11:37:15 +09:00
parent e6152331b0
commit b158e7347e
1 changed files with 17 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
front_end/src/yew_components.rs
View file

@ -630,6 +630,20 @@ impl Wrapper {
} }
} }
} }
fn send_disconnect(&mut self) {
if let Some(id) = self.player_id.take() {
let function = Function::new_no_args(&format!(
"
let xhr = new XMLHttpRequest();
xhr.open('POST', '{}');
xhr.send('{{\"type\": \"disconnect\", \"id\": {}}}');
",
BACKEND_URL, id
));
function.call0(&function).ok();
}
}
} }
#[derive(Clone, Debug, PartialEq, Eq)] #[derive(Clone, Debug, PartialEq, Eq)]
@ -1264,17 +1278,7 @@ impl Component for Wrapper {
WrapperMsg::StartBackendTickImpl => { WrapperMsg::StartBackendTickImpl => {
// If previous id is still stored, request disconnect so that a // If previous id is still stored, request disconnect so that a
// new id can be received // new id can be received
if let Some(id) = self.player_id.take() { self.send_disconnect();
let function = Function::new_no_args(&format!(
"
let xhr = new XMLHttpRequest();
xhr.open('POST', '{}');
xhr.send('{{\"type\": \"disconnect\", \"id\": {}}}');
",
BACKEND_URL, id
));
function.call0(&function).ok();
}
self.do_backend_tick = true; self.do_backend_tick = true;
ctx.link().send_message(WrapperMsg::BackendTick); ctx.link().send_message(WrapperMsg::BackendTick);
} }
@ -1283,17 +1287,7 @@ impl Component for Wrapper {
shared.game_state.borrow().is_networked_multiplayer(); shared.game_state.borrow().is_networked_multiplayer();
if !self.do_backend_tick || !is_networked_multiplayer { if !self.do_backend_tick || !is_networked_multiplayer {
// disconnect id if backend tick is to be stopped // disconnect id if backend tick is to be stopped
if let Some(id) = self.player_id.take() { self.send_disconnect();
let function = Function::new_no_args(&format!(
"
let xhr = new XMLHttpRequest();
xhr.open('POST', '{}');
xhr.send('{{\"type\": \"disconnect\", \"id\": {}}}');
",
BACKEND_URL, id
));
function.call0(&function).ok();
}
return false; return false;
} }
@ -1714,17 +1708,7 @@ impl Component for Wrapper {
element_remove_class(&document, &format!("slot{}", idx), "magenta").ok(); element_remove_class(&document, &format!("slot{}", idx), "magenta").ok();
element_append_class(&document, &format!("slot{}", idx), "open").ok(); element_append_class(&document, &format!("slot{}", idx), "open").ok();
} }
if let Some(id) = self.player_id.take() { self.send_disconnect();
let function = Function::new_no_args(&format!(
"
let xhr = new XMLHttpRequest();
xhr.open('POST', '{}');
xhr.send('{{\"type\": \"disconnect\", \"id\": {}}}');
",
BACKEND_URL, id
));
function.call0(&function).ok();
}
self.place_request = None; self.place_request = None;
element_remove_class(&document, "mainmenu", "hidden_menu").ok(); element_remove_class(&document, "mainmenu", "hidden_menu").ok();
element_append_class(&document, "mainmenu", "menu").ok(); element_append_class(&document, "mainmenu", "menu").ok();