From ed6e2e5055014a649efe418d14bfaf48f5972adf Mon Sep 17 00:00:00 2001
From: Felipe Gasper <felipe@felipegasper.com>
Date: Tue, 17 Oct 2017 09:28:41 +0200
Subject: [PATCH] Reorder demo components, ensure we hide at end of receive.

---
 demo/index.html | 24 +++++++++++++++---------
 demo/main.js    | 12 ++++++++++--
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/demo/index.html b/demo/index.html
index f808ccbe..dea1e400 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -34,15 +34,6 @@
                 <button type="submit">Submit</button>
             </form>
 
-            <div id="zm_file" style="display: none">
-                <div>Name: <span id="name"></span></div>
-                <div>Size: <span id="size"></span></div>
-                <div>Last modified: <span id="mtime"></span></div>
-                <div>Mode: <span id="mode"></span></div>
-                <div>Files remaining: <span id="files_remaining"></span></div>
-                <div>Bytes remaining: <span id="bytes_remaining"></span></div>
-            </div>
-
             <form id="zm_offer" style="display: none" action="javascript:void(0)">
                 <p>ZMODEM File offered!</p>
 
@@ -52,6 +43,21 @@
                 <button type="submit">Submit</button>
             </form>
 
+            <div id="zm_file" style="display: none">
+                <div>Name: <span id="name"></span></div>
+                <div>Size: <span id="size"></span></div>
+                <div>Last modified: <span id="mtime"></span></div>
+                <div>Mode: <span id="mode"></span></div>
+                <br>
+                <div>Conversion: <span id="zfile_conversion"></span></div>
+                <div>Management: <span id="zfile_management"></span></div>
+                <div>Transport: <span id="zfile_transport"></span></div>
+                <div>Sparse? <span id="zfile_sparse"></span></div>
+                <br>
+                <div>Files remaining in batch: <span id="files_remaining"></span></div>
+                <div>Bytes remaining in batch: <span id="bytes_remaining"></span></div>
+            </div>
+
             <form id="zm_progress" style="display: none" action="javascript:void(0)">
                 <div><span id="percent_received"></span>% (<span id="bytes_received"></span> bytes) received</div>
                 <button type="button" onclick="abort_current_session(); this.form.style.display='none';">Abort ZMODEM</button>
diff --git a/demo/main.js b/demo/main.js
index 0522e0b3..3186a5eb 100644
--- a/demo/main.js
+++ b/demo/main.js
@@ -168,6 +168,11 @@ function _show_file_info(xfer) {
 
     document.getElementById("mode").textContent = "0" + file_info.mode.toString(8);
 
+    var xfer_opts = xfer.get_options();
+    ["conversion", "management", "transport", "sparse"].forEach( (lbl) => {
+        document.getElementById(`zfile_${lbl}`).textContent = xfer_opts[lbl];
+    } );
+
     document.getElementById("zm_file").style.display = "";
 }
 function _hide_file_info() {
@@ -218,8 +223,6 @@ function _handle_receive_session(zsession) {
                 });
                 xfer.accept().then(
                     () => {
-                        _hide_file_info();
-                        _hide_progress();
                         _save_to_disk(xfer, FILE_BUFFER);
                     },
                     console.error.bind(console)
@@ -232,6 +235,11 @@ function _handle_receive_session(zsession) {
         };
     } );
 
+    zsession.on("session_end", () => {
+        _hide_file_info();
+        _hide_progress();
+    } );
+
     zsession.start();
 }