From cf3e4ca69bb9f4118fa73ff7e52688e4f9712705 Mon Sep 17 00:00:00 2001
From: mmcwilliams <hi@mmcwilliams.com>
Date: Tue, 21 Nov 2017 17:08:54 -0500
Subject: [PATCH] Trigger a frame and increment the counter.

---
 app/www/index.html | 54 +++++++++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/app/www/index.html b/app/www/index.html
index f6fb182..a46d7f3 100644
--- a/app/www/index.html
+++ b/app/www/index.html
@@ -245,12 +245,13 @@
 	<img id="mscriptIcon" onclick="mscriptPage();" class="icon" src="data:image/svg+xml;utf8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pgo8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTYuMC4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+CjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4PSIwcHgiIHk9IjBweCIgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDUyMi40NjggNTIyLjQ2OSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgNTIyLjQ2OCA1MjIuNDY5OyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxnPgoJPGc+CgkJPHBhdGggZD0iTTMyNS43NjIsNzAuNTEzbC0xNy43MDYtNC44NTRjLTIuMjc5LTAuNzYtNC41MjQtMC41MjEtNi43MDcsMC43MTVjLTIuMTksMS4yMzctMy42NjksMy4wOTQtNC40MjksNS41NjhMMTkwLjQyNiw0NDAuNTMgICAgYy0wLjc2LDIuNDc1LTAuNTIyLDQuODA5LDAuNzE1LDYuOTk1YzEuMjM3LDIuMTksMy4wOSwzLjY2NSw1LjU2OCw0LjQyNWwxNy43MDEsNC44NTZjMi4yODQsMC43NjYsNC41MjEsMC41MjYsNi43MS0wLjcxMiAgICBjMi4xOS0xLjI0MywzLjY2Ni0zLjA5NCw0LjQyNS01LjU2NEwzMzIuMDQyLDgxLjkzNmMwLjc1OS0yLjQ3NCwwLjUyMy00LjgwOC0wLjcxNi02Ljk5OSAgICBDMzMwLjA4OCw3Mi43NDcsMzI4LjIzNyw3MS4yNzIsMzI1Ljc2Miw3MC41MTN6IiBmaWxsPSIjRkZGRkZGIi8+CgkJPHBhdGggZD0iTTE2Ni4xNjcsMTQyLjQ2NWMwLTIuNDc0LTAuOTUzLTQuNjY1LTIuODU2LTYuNTY3bC0xNC4yNzctMTQuMjc2Yy0xLjkwMy0xLjkwMy00LjA5My0yLjg1Ny02LjU2Ny0yLjg1NyAgICBzLTQuNjY1LDAuOTU1LTYuNTY3LDIuODU3TDIuODU2LDI1NC42NjZDMC45NSwyNTYuNTY5LDAsMjU4Ljc1OSwwLDI2MS4yMzNjMCwyLjQ3NCwwLjk1Myw0LjY2NCwyLjg1Niw2LjU2NmwxMzMuMDQzLDEzMy4wNDQgICAgYzEuOTAyLDEuOTA2LDQuMDg5LDIuODU0LDYuNTY3LDIuODU0czQuNjY1LTAuOTUxLDYuNTY3LTIuODU0bDE0LjI3Ny0xNC4yNjhjMS45MDMtMS45MDIsMi44NTYtNC4wOTMsMi44NTYtNi41NyAgICBjMC0yLjQ3MS0wLjk1My00LjY2MS0yLjg1Ni02LjU2M0w1MS4xMDcsMjYxLjIzM2wxMTIuMjA0LTExMi4yMDFDMTY1LjIxNywxNDcuMTMsMTY2LjE2NywxNDQuOTM5LDE2Ni4xNjcsMTQyLjQ2NXoiIGZpbGw9IiNGRkZGRkYiLz4KCQk8cGF0aCBkPSJNNTE5LjYxNCwyNTQuNjYzTDM4Ni41NjcsMTIxLjYxOWMtMS45MDItMS45MDItNC4wOTMtMi44NTctNi41NjMtMi44NTdjLTIuNDc4LDAtNC42NjEsMC45NTUtNi41NywyLjg1N2wtMTQuMjcxLDE0LjI3NSAgICBjLTEuOTAyLDEuOTAzLTIuODUxLDQuMDktMi44NTEsNi41NjdzMC45NDgsNC42NjUsMi44NTEsNi41NjdsMTEyLjIwNiwxMTIuMjA0TDM1OS4xNjMsMzczLjQ0MiAgICBjLTEuOTAyLDEuOTAyLTIuODUxLDQuMDkzLTIuODUxLDYuNTYzYzAsMi40NzgsMC45NDgsNC42NjgsMi44NTEsNi41N2wxNC4yNzEsMTQuMjY4YzEuOTA5LDEuOTA2LDQuMDkzLDIuODU0LDYuNTcsMi44NTQgICAgYzIuNDcxLDAsNC42NjEtMC45NTEsNi41NjMtMi44NTRMNTE5LjYxNCwyNjcuOGMxLjkwMy0xLjkwMiwyLjg1NC00LjA5NiwyLjg1NC02LjU3ICAgIEM1MjIuNDY4LDI1OC43NTUsNTIxLjUxNywyNTYuNTY1LDUxOS42MTQsMjU0LjY2M3oiIGZpbGw9IiNGRkZGRkYiLz4KCTwvZz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8L3N2Zz4K" />
 </footer>
 <script>
-	var BOLEX = {
+	'use strict';
+	const BOLEX = {
 		angle : 133,
 		prism : 0.8,
 		expected : 630
 	};
-	var STATE = {
+	const STATE = {
 		dir : true,
 		exposure : 630, //always ms
 		delay : 0,
@@ -367,9 +368,9 @@
 		}
 	};
 	var incCounter = function (val) {
-		'use strict';
-		var current = $('#counter').val();
-		$('#counter').val(parseInt(current) + val);
+		const elem = document.getElementById('counter');
+		const current = elem.value;
+		elem.value = (parseInt(current) + val);
 		STATE.counter += val;
 	};
 	var appPage = function () {
@@ -394,16 +395,23 @@
 	const web = {};
 	web._header = new Headers({ 'content-type' : 'application/json' })
 	web.frame = function () {
-		$.ajax({
+		const opts = {
 			method : 'POST',
-			url : '/frame',
-			contentType: 'application/json',
-			dataType : 'json',
-			success : web.frameSuccess
-		});
+			headers : web._header,
+			body : JSON.stringify({})
+		};
+		fetch('/frame', opts)
+			.then(res => {
+				return res.json()
+			})
+			.then(web.frameSuccess)
+			.catch(err => {
+				console.error('Error triggering frame')
+				console.error(err)
+			});
 	}
 	web.frameSuccess = function (res) {
-		$('#frame').blur();
+		document.getElementById('frame').blur();
 		if (res.dir === true) {
 			incCounter(1);
 		} else {
@@ -412,18 +420,17 @@
 	};
 	web.setDir = function () {
 		const dir = !document.getElementById('dir').checked;
-		console.log('set to => ' + dir)
 		const opts = {
 			method : 'POST',
 			headers : web._header,
 			body : JSON.stringify({ dir : dir })
 		};
-		console.dir(opts)
 		fetch('/dir', opts)
 			.then(res => {
 				return res.json()
 			})
-			.then(web.setDirSuccess).catch(err => {
+			.then(web.setDirSuccess)
+			.catch(err => {
 				console.error('Error setting direction')
 				console.error(err);
 			});
@@ -431,14 +438,18 @@
 	web.setDirSuccess = function (res) {
 		STATE.dir = res.dir;
 		setDirLabel(res.dir);
-		console.log('setDir to ' + res.dir);
+		console.log(`setDir to ${res.dir}`);
 	};
 	web.getState = function () {
-		$.ajax({
-			method : 'GET',
-			url : '/status',
-			success : web.getStateSuccess
-		});
+		fetch('/status')
+			.then(res => {
+				return res.json()
+			})
+			.then(web.getStateSuccess)
+			.catch(err => {
+				console.error('Error getting state');
+				console.error(err);
+			});
 	};
 	web.getStateSuccess = function (res) {
 		var exposure;
@@ -522,7 +533,6 @@
 		console.log('setCounter to ' + res.counter);
 	};
 	web.init = function () {
-		'use strict';
 		frame = web.frame;
 		getState = web.getState;
 		setDir = web.setDir;