Reorder demo components, ensure we hide at end of receive.

This commit is contained in:
Felipe Gasper
2017-10-17 09:28:41 +02:00
parent 1ee6af2f82
commit ed6e2e5055
2 changed files with 25 additions and 11 deletions
+15 -9
View File
@@ -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>
+10 -2
View File
@@ -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();
}