add version string to webasm page

bwburnsides · Jan 14, 2019 · 809d72f · 809d72f
1 parent b129363
commit 809d72f
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 2 deletions.
diff --git a/run_local_server.bat b/run_local_server.bat
@@ -0,0 +1,5 @@
+where /q http-server
+
+IF ERRORLEVEL 1 (npm i -g http-server)
+
+http-server -p 80
diff --git a/run_local_webasm_server.bat b/run_local_webasm_server.bat
diff --git a/src/webasm/mod.rs b/src/webasm/mod.rs
@@ -47,6 +47,13 @@ pub unsafe extern fn wasm_assemble(format: u32, src: *mut String) -> *mut String
 }
 
 
+#[no_mangle]
+pub unsafe extern fn wasm_get_version() -> *mut String
+{
+	wasm_string_new_with(env!("CARGO_PKG_VERSION"))
+}
+
+
 #[no_mangle]
 pub unsafe extern fn wasm_string_new(len: u32) -> *mut String
 {

diff --git a/webasm/index.html b/webasm/index.html
@@ -96,6 +96,7 @@
 					<option>Bin String</option>
 				</select>
 				<button id="buttonAssemble" onclick="assemble()" disabled>Assemble (Ctrl+Enter) &gt;&gt;</button>
+				<span id="spanVersion"></span>
 				<a href="https://github.com/hlorenzi/customasm">GitHub Repository</a>
 			</div>
 			<div id="divOutput">

diff --git a/webasm/main.js b/webasm/main.js
@@ -8,7 +8,6 @@ function main()
 	onResize()
 
 	document.body.onresize = onResize
-	window.onresize = onResize
 	window.onkeydown = onKeyDown
 	window.onbeforeunload = onBeforeUnload
 
@@ -19,6 +18,7 @@ function main()
 		{
 			g_wasm = wasm
 			document.getElementById("buttonAssemble").disabled = false
+			setupVersionString()
 		})
 }
 
@@ -39,6 +39,25 @@ function setupEditor()
 }
 
 
+function setupVersionString()
+{
+	let outputPtr = null
+	try
+	{
+		outputPtr = g_wasm.instance.exports.wasm_get_version()
+	}
+	catch (e)
+	{
+		throw e
+	}
+
+	let output = readRustString(outputPtr)
+	dropRustString(outputPtr)
+
+	document.getElementById("spanVersion").innerHTML = "v" + output
+}
+
+
 function onResize()
 {
 	let rectInput = document.getElementById("divCodeMirror").getBoundingClientRect()