From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 6 Jul 2020 15:08:49 +0000 (+0100)
Subject: log entry is displayed
X-Git-Tag: otter-0.2.0~1427
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=460c3530c48cbae9f9753ae592f9f4a0bda01542;p=otter.git

log entry is displayed
---

diff --git a/src/bin/server.rs b/src/bin/server.rs
index 3edfcb74..7c969b60 100644
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -157,11 +157,12 @@ fn api_grab(form : Json<ApiGrab>) -> impl response::Responder<'static> {
       face : p.face,
     };
     let logentry = Arc::new(LogEntry {
-      msg : format!("{} grasped {}",
-                    &htmlescape::encode_minimal(&pl.nick),
-                    p.describe_html(&pri)),
-                    // split view: pri should be global
-                    // (currently log is one global view)
+      html : format!("{} grasped {}",
+                     &htmlescape::encode_minimal(&pl.nick),
+                     p.describe_html(&pri
+                                     // split view: pri should be global
+                                     // (currently log is one global view)
+                     )),
     });
     gs_log.push((gen,logentry.clone()));
     let op = PieceUpdateOp::Modify(p.prep_piecestate(&pri));
diff --git a/src/gamestate.rs b/src/gamestate.rs
index faa3afe8..2a8fc825 100644
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -114,7 +114,7 @@ pub struct Player {
 
 #[derive(Debug,Serialize)]
 pub struct LogEntry {
-  pub msg : String,
+  pub html : String,
 }
 
 pub fn xxx_gamestate_init() -> GameState {
diff --git a/src/global.rs b/src/global.rs
index 18895a4e..b125a9c2 100644
--- a/src/global.rs
+++ b/src/global.rs
@@ -42,7 +42,7 @@ impl PreparedUpdateEntry {
         op.new_state().map(|x| x.svg.len()).unwrap_or(0)
       },
       Log(logent) => {
-        logent.msg.as_bytes().len() * 3
+        logent.html.as_bytes().len() * 3
       }
     }
   }
diff --git a/templates/script.js b/templates/script.js
index 19487341..30afbbb1 100644
--- a/templates/script.js
+++ b/templates/script.js
@@ -224,6 +224,9 @@ messages.Log = function(j) {
     logdiv.getBoundingClientRect().bottom;
 
   console.log('LOG UPDATE ',in_scrollback, j);
+  var nelem = document.createElement('div');
+  nelem.innerHTML = j.html;
+  logdiv.appendChild(nelem);
 
   if (!in_scrollback) {
     lastent = logdiv.lastElementChild;
diff --git a/templates/session.tera b/templates/session.tera
index f4effe7d..fbcf1b02 100644
--- a/templates/session.tera
+++ b/templates/session.tera
@@ -42,7 +42,6 @@
     Log item 10
     <br>
     Log item 11
-    <div id="log12">Log item 12</id>
-  </p>
+    <div id="log12">Log item 12</div>
 
 </body>