reset button, refined css, loader, improved timeout calculation

html_src/js-src/lib/chibi.js

@@ -616,12 +616,17 @@
 				// prevent caching
 				url += (url.indexOf('?') === -1) ? '?' + timestamp : '&' + timestamp;
 
+				$('#loader').addClass('show');
+
 				// Douglas Crockford: "Synchronous programming is disrespectful and should not be employed in applications which are used by people"
 				xhr.open(type, url, true);
 
+				xhr.timeout = 15000; // a default value. TODO way to set it for the caller
+
 				xhr.onreadystatechange = function () {
 					if (xhr.readyState === 4) {
-						if (callback) {
+						$('#loader').removeClass('show');
+						if (callback && xhr.status != 0) { // xhr.status 0 means "aborted"
 							callback(xhr.responseText, xhr.status);
 						}
 					}

html_src/js-src/page_waveform.js

@@ -137,22 +137,27 @@ var page_waveform = (function () {
 		readoutPending = false;
 
 		if (status != 200) {
-			if (status != 0) { // 0 = aborted
-				alert("Request failed.");
+			console.error("Request failed.");
+
+			if (autoReload)
+				toggleAutoReload(); // turn it off.
+
+		} else {
+			var j = JSON.parse(resp);
+			if (!j.success) {
+				console.error("Sampling / readout failed.");
+
+				if (autoReload)
+					toggleAutoReload(); // turn it off.
+
+				return;
 			}
-			return;
+
+			buildChart(j);
+
+			if (autoReload)
+				arTimeout = setTimeout(requestReload, autoReloadTime);
 		}
-
-		var j = JSON.parse(resp);
-		if (!j.success) {
-			alert("Sampling failed.");
-			return;
-		}
-
-		if (autoReload)
-			arTimeout = setTimeout(requestReload, autoReloadTime);
-
-		buildChart(j);
 	}
 
 	function requestReload() {
@@ -171,6 +176,22 @@ var page_waveform = (function () {
 		return true;
 	}
 
+	function toggleAutoReload() {
+		autoReloadTime = +$('#ar-time').val() * 1000; // ms
+
+		autoReload = !autoReload;
+		if (autoReload) {
+			requestReload();
+		} else {
+			clearTimeout(arTimeout);
+		}
+
+		$('#ar-btn')
+			.toggleClass('btn-blue')
+			.toggleClass('btn-red')
+			.val(autoReload ? 'Stop' : 'Auto');
+	}
+
 	wfm.init = function (format) {
 		// --- Load data ---
 		dataFormat = format;
@@ -211,21 +232,7 @@ var page_waveform = (function () {
 		});
 
 		// auto-reload button
-		$('#ar-btn').on('click', function() {
-			autoReloadTime = +$('#ar-time').val() * 1000; // ms
-
-			autoReload = !autoReload;
-			if (autoReload) {
-				requestReload();
-			} else {
-				clearTimeout(arTimeout);
-			}
-
-			$('#ar-btn')
-				.toggleClass('btn-blue')
-				.toggleClass('btn-red')
-				.val(autoReload ? 'Stop' : 'Auto');
-		});
+		$('#ar-btn').on('click', toggleAutoReload);
 	};
 
 	return wfm;