From: Ian Jackson Date: Sat, 4 Jul 2020 11:29:29 +0000 (+0100) Subject: wip X-Git-Tag: otter-0.2.0~1472 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=afc1224c22c060a2d82426094ab62237138f451f;p=otter.git wip --- diff --git a/src/bin/server.rs b/src/bin/server.rs index 685045a4..04a6ec12 100644 --- a/src/bin/server.rs +++ b/src/bin/server.rs @@ -201,7 +201,7 @@ fn api_move(form : Json) -> impl response::Responder<'static> { } #[get("/_/updates//")] -#[throws(OE)] +#[throws(rocket::response::Debug)] fn updates(ctoken : InstanceAccess, gen: u64) -> impl response::Responder<'static> { let gen = Generation(gen); diff --git a/templates/script.js b/templates/script.js index 4150e90d..bd2f217d 100644 --- a/templates/script.js +++ b/templates/script.js @@ -183,13 +183,14 @@ function startup() { var body = document.getElementById("main-body"); ctoken = body.dataset.ctoken; us = body.dataset.us; + gen = body.dataset.gen; status_node = document.getElementById('status'); status_node.innerHTML = 'js-done' dragthresh = 5; space = document.getElementById('space'); svg_ns = space.getAttribute('xmlns'); - es = new EventSource("/_/updates/"+ctoken); + es = new EventSource("/_/updates/"+ctoken+'/'+gen); 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 6b55a747..577b9729 100644 --- a/templates/test.tera +++ b/templates/test.tera @@ -1,4 +1,8 @@ - +{# -*- HTML -*- -#}

Hi!