Merge remote-tracking branch 'SentinelMKX/master' into v2.2

web_interface/js/scan.js

@@ -128,11 +128,40 @@ function drawNames(){
 	getE("nTable").innerHTML = html;
 }
 				
+var duts;
+var elxtime;
 function scan(type){
+	getE('RButton').disabled = true;
+	switch(type){
+		case 0:
+			getE('scanOne').disabled = true;
+			getE('scanZero').style.visibility = 'hidden';
+			elxtime = 2450;
+			break;
+		case 1:
+			getE('scanZero').disabled = true;
+			getE('scanOne').style.visibility = 'hidden';
+			elxtime = parseInt(getE("scanTime").value+"000") + 1500;
+	}
 	var cmdStr = "scan "
 		+ (type == 0 ? "aps " : "stations -t "+getE("scanTime").value+"s")
 		+ " -ch "+getE("ch").options[getE("ch").selectedIndex].value;
 	getFile("run?cmd="+cmdStr);
+	duts = parseInt(type);
+	setTimeout(buttonFunc, elxtime)
+}
+
+function buttonFunc(){
+	switch (duts) {
+		case 0:
+			getE('scanZero').style.visibility = 'visible';
+			getE('scanOne').disabled = false;
+			break;
+		case 1:
+			getE('scanOne').style.visibility = 'visible';
+			getE('scanZero').disabled = false;
+	}
+	getE('RButton').disabled = false;
 }
 
 function load(){

web_interface/scan.html

@@ -24,10 +24,10 @@
 				<div class="col-12">
 					<div id="error" class="hide"></div>
 					<h1 class="header" data-translate="scan">Scan</h1>
-					
-					<button onclick="scan(0)">Scan APs</button>
-					<button onclick="scan(1)">Scan Stations</button>
-					<button onclick="load()" data-translate="reload" class="right">Reload</button>
+
+					<button id=scanZero onclick="scan(0)">Scan APs</button>
+					<button id=scanOne onclick="scan(1)">Scan Stations</button>
+					<button id=RButton onclick="load()" data-translate="reload" class="right">Reload</button>
 				</div>
 			</div>
 			<div class="row">
@@ -73,29 +73,29 @@
 						</span>
 						<span data-translate="info_disclaimer">In case of an unexpected error, please reload the site and look at the serial monitor for further debugging.</span>
 					</p>
-					
+
 					<hr>
-					
+
 					<h2><span>Access Points</span>: <span id="apNum"></span></h2>
 					<table id="apTable"></table>
 					<button onclick="selectAll(0,true)" data-translate="select_all">select all</button>
 					<button onclick="selectAll(0,false)" data-translate="deselect_all">deselect all</button>
-					
+
 					<hr>
-					
+
 					<h2><span>Stations</span>: <span id="stNum"></span></h2>
 					<table id="stTable"></table>
 					<button onclick="selectAll(1,true)" data-translate="select_all">select all</button>
 					<button onclick="selectAll(1,false)" data-translate="deselect_all">deselect all</button>
-					
+
 					<hr>
-					
+
 					<h2><span data-translate="devices">Saved Devices</span>: <span id="nNum"></span></h2>
 					<table id="nTable"></table>
 					<button onclick="selectAll(2,true)" data-translate="select_all">select all</button>
 					<button onclick="selectAll(2,false)" data-translate="deselect_all">deselect all</button>
 					<button onclick="add(2)" data-translate="new">new</button>
-					
+
 					<div id="copyright">
 						<a href="https://github.com/spacehuhn/esp8266_deauther/wiki" target="_blank">Wiki</a> | <a href="https://github.com/spacehuhn/esp8266_deauther" target="_blank">GitHub</a><br>
 						<br>

web_interface/style.css

@@ -321,7 +321,16 @@ button:hover, input[type="submit"]:hover, input[type="reset"]:hover, input[type=
 button:active, input[type="submit"]:active, input[type="reset"]:active, input[type="button"]:active {
 	transform: scale(.93);
 }
-
+button:disabled:hover, input[type="submit"]:disabled:hover, input[type="reset"]:disabled:hover, input[type="button"]:disabled:hover {
+	background: white;
+	cursor: not-allowed;
+	opacity: 0.40;
+	filter: alpha(opacity=40);
+	transform: scale(1);
+}
+button::-moz-focus-inner {
+  border: 0;
+}
 /* Forms */
 input[type="email"], input[type="number"], input[type="search"], input[type="text"], input[type="tel"], input[type="url"], input[type="password"], textarea, select {
 	height: 38px;