From: Ian Jackson Date: Tue, 23 Jun 2020 19:45:30 +0000 (+0100) Subject: better but weirdly "[object]" X-Git-Tag: otter-0.2.0~1561 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=da152cb72ba5e4ebf0833442003fd7b9a30386b8;p=otter.git better but weirdly "[object]" --- diff --git a/src/bin/server.rs b/src/bin/server.rs index 14498b73..f78d6dfe 100644 --- a/src/bin/server.rs +++ b/src/bin/server.rs @@ -52,7 +52,7 @@ fn loading(token : InstanceAccess) -> Result { #[derive(Serialize,Debug)] struct SessionRenderContext { - c : ClientId, + clientid : ClientId, } #[derive(Deserialize)] @@ -68,7 +68,7 @@ fn session(form : Json) -> Result { let user = g.users.get_mut(iad.user).ok_or_else(|| anyhow!("user deleted"))?; let client = Client { }; let clientid = user.clients.insert(client); - SessionRenderContext { c : clientid } + SessionRenderContext { clientid } }; Ok(Template::render("test",&c)) } diff --git a/templates/script.js b/templates/script.js index 96034fa5..f7d54838 100644 --- a/templates/script.js +++ b/templates/script.js @@ -90,12 +90,13 @@ messages.TestCounter = function(data) { } function startup() { + clientid = document.getElementById("main-body").dataset.clientid; status_node = document.getElementById('status'); status_node.innerHTML = 'js-done' dragthresh = 5; space = document.getElementById('space'); - es = new EventSource("/_/updates"); + es = new EventSource("/_/updates/"+token+"/"+clientid); es.onmessage = function(event) { var j = JSON.parse(event.data); var k = Object.keys(j)[0]; diff --git a/templates/test.tera b/templates/test.tera index e8eef9b0..8e1980b5 100644 --- a/templates/test.tera +++ b/templates/test.tera @@ -1,4 +1,4 @@ - +

Hi!