nathan/xTeVe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.0.0.0008-beta

Browse Source 
Pull request: Error in http/https detection. (#6)
This commit is contained in:
marmei
2019-08-09 09:31:31 +02:00
parent 96e10ff51d
commit 67fe80b4fd
5 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/js/network_ts.js
View File

@@ -16,7 +16,7 @@ var Server = /** @class */ (function () {
case "http:": case "http:":
this.protocol = "ws://"; this.protocol = "ws://";
break; break;
case "https://": case "https:":
this.protocol = "wss://"; this.protocol = "wss://";
break; break;
} }

73
src/webUI.go
View File

File diff suppressed because one or more lines are too long

4
src/webserver.go
View File

@@ -41,10 +41,10 @@ func StartWebserver() (err error) {
showHighlight(fmt.Sprintf("Web Interface:%s://%s:%s/web/", System.ServerProtocol.WEB, System.IPAddress, Settings.Port)) showHighlight(fmt.Sprintf("Web Interface:%s://%s:%s/web/", System.ServerProtocol.WEB, System.IPAddress, Settings.Port))
case 1: case 1:
showHighlight(fmt.Sprintf("Web Interface:%s://%s:%s/web/ | xTeVe is also available via the other %d IP", System.ServerProtocol.WEB, System.IPAddress, Settings.Port, ips)) showHighlight(fmt.Sprintf("Web Interface:%s://%s:%s/web/ | xTeVe is also available via the other %d IP.", System.ServerProtocol.WEB, System.IPAddress, Settings.Port, ips))
default: default:
showHighlight(fmt.Sprintf("Web Interface:%s://%s:%s/web/ | xTeVe is also available via the other %d IP's", System.ServerProtocol.WEB, System.IPAddress, Settings.Port, len(System.IPAddressesV4)+len(System.IPAddressesV6)-1)) showHighlight(fmt.Sprintf("Web Interface:%s://%s:%s/web/ | xTeVe is also available via the other %d IP's.", System.ServerProtocol.WEB, System.IPAddress, Settings.Port, len(System.IPAddressesV4)+len(System.IPAddressesV6)-1))
} }

2
ts/network_ts.ts
View File

@@ -24,7 +24,7 @@ class Server {
case "http:": case "http:":
this.protocol = "ws://" this.protocol = "ws://"
break break
case "https://": case "https:":
this.protocol = "wss://" this.protocol = "wss://"
break break
} }

2
xteve.go
View File

@@ -48,7 +48,7 @@ const DBVersion = "2.0.0"
const APIVersion = "1.1.0" const APIVersion = "1.1.0"
// Dev : Aktiviert den Entwicklungsmodus. Für den Webserver werden dann die lokalen Dateien verwendet. // Dev : Aktiviert den Entwicklungsmodus. Für den Webserver werden dann die lokalen Dateien verwendet.
const Dev = false const Dev = true
var homeDirectory = fmt.Sprintf("%s%s.%s%s", src.GetUserHomeDirectory(), string(os.PathSeparator), strings.ToLower(Name), string(os.PathSeparator)) var homeDirectory = fmt.Sprintf("%s%s.%s%s", src.GetUserHomeDirectory(), string(os.PathSeparator), strings.ToLower(Name), string(os.PathSeparator))
var samplePath = fmt.Sprintf("%spath%sto%sxteve%s", string(os.PathSeparator), string(os.PathSeparator), string(os.PathSeparator), string(os.PathSeparator)) var samplePath = fmt.Sprintf("%spath%sto%sxteve%s", string(os.PathSeparator), string(os.PathSeparator), string(os.PathSeparator), string(os.PathSeparator))