From 810374a25d0c6c28ff00ec86579299b9acd7ae2f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 27 Nov 2020 00:47:58 +0000 Subject: [PATCH] last log timestamp progation from session.rs to script.ts Signed-off-by: Ian Jackson --- src/session.rs | 4 +++- templates/script.ts | 10 +--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/session.rs b/src/session.rs index febb50d2..f42babbb 100644 --- a/src/session.rs +++ b/src/session.rs @@ -43,6 +43,7 @@ struct SessionPieceLoadJson<'r> { #[derive(Serialize,Debug)] struct DataLoad { + last_log_ts: String, players : HashMap, } #[derive(Serialize,Debug)] @@ -190,7 +191,8 @@ fn session(form : Json, layout: PresentationLayout) sse_url_prefix, ptoken: form.ptoken.clone(), load : serde_json::to_string(&DataLoad { - players : load_players, + players: load_players, + last_log_ts: timestamp_abbrev.unwrap_or_default(), }).map_err(|e| InternalError::JSONEncode(e))?, }; trace!("SessionRenderContext {:?}", &src); diff --git a/templates/script.ts b/templates/script.ts index a80fe616..339ab4dc 100644 --- a/templates/script.ts +++ b/templates/script.ts @@ -1112,15 +1112,7 @@ function startup() { redisplay_ancillaries(piece,p); } - let lastlogent_s = ''; - if (layout == 'Landscape') { - // xxx this is wrong, use value provided by session.rs - let lastent = log_elem.lastElementChild; - if (lastent !== null) { - lastlogent_s = lastent.firstElementChild!.innerHTML; - } - } - last_log_ts = wasm_bindgen.timestamp_abbreviator(lastlogent_s); + last_log_ts = wasm_bindgen.timestamp_abbreviator(dataload.last_log_ts); var es = new EventSource( sse_url_prefix + "/_/updates?ctoken="+ctoken+'&gen='+gen -- 2.30.2