Merge pull request #4 from SEPIA-Framework/dev

fquirin · web-flow · commit ba2b8b464aba · 2018-12-24T12:07:41.000+01:00
load custom server automatically if page called from [IP]:[PORT] host
diff --git a/admin-web-tools/index.html b/admin-web-tools/index.html
@@ -71,11 +71,18 @@
 		}
 		var customServer = sessionStorage.getItem('customServer');
 		if (customServer){
+			//stored server
 			$('#server').val(customServer);
 		}else{
 			var serverViaUrl = getURLParameter('server');
 			if (serverViaUrl){
+				//URL parameter server
 				$('#server').val(serverViaUrl);
+			}else{
+				if (location.host.indexOf(":") > 0){
+					//local server [IP]:[PORT]
+					$('#server').val(location.origin + "/");
+				}
 			}
 		}
 		var server = sessionStorage.getItem('server');

Original file line number	Diff line number	Diff line change
`@@ -71,11 +71,18 @@`
`71`	`71`	`}`
`72`	`72`	`var customServer = sessionStorage.getItem('customServer');`
`73`	`73`	`if (customServer){`
	`74`	`+ //stored server`
`74`	`75`	`$('#server').val(customServer);`
`75`	`76`	`}else{`
`76`	`77`	`var serverViaUrl = getURLParameter('server');`
`77`	`78`	`if (serverViaUrl){`
	`79`	`+ //URL parameter server`
`78`	`80`	`$('#server').val(serverViaUrl);`
	`81`	`+ }else{`
	`82`	`+ if (location.host.indexOf(":") > 0){`
	`83`	`+ //local server [IP]:[PORT]`
	`84`	`+ $('#server').val(location.origin + "/");`
	`85`	`+ }`
`79`	`86`	`}`
`80`	`87`	`}`
`81`	`88`	`var server = sessionStorage.getItem('server');`