Skip to content

Commit

Permalink
v2.0.0.0008-beta
Browse files Browse the repository at this point in the history
Pull request: Error in http/https detection. (#6)
  • Loading branch information
mar-mei committed Aug 9, 2019
1 parent 96e10ff commit 67fe80b
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 39 deletions.
2 changes: 1 addition & 1 deletion html/js/network_ts.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var Server = /** @class */ (function () {
case "http:":
this.protocol = "ws://";
break;
case "https://":
case "https:":
this.protocol = "wss://";
break;
}
Expand Down
67 changes: 33 additions & 34 deletions src/webUI.go

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/webserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ func StartWebserver() (err error) {
showHighlight(fmt.Sprintf("Web Interface:%s://%s:%s/web/", System.ServerProtocol.WEB, System.IPAddress, Settings.Port))

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:
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))

}

Expand Down
2 changes: 1 addition & 1 deletion ts/network_ts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Server {
case "http:":
this.protocol = "ws://"
break
case "https://":
case "https:":
this.protocol = "wss://"
break
}
Expand Down
2 changes: 1 addition & 1 deletion xteve.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const DBVersion = "2.0.0"
const APIVersion = "1.1.0"

// 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 samplePath = fmt.Sprintf("%spath%sto%sxteve%s", string(os.PathSeparator), string(os.PathSeparator), string(os.PathSeparator), string(os.PathSeparator))
Expand Down

0 comments on commit 67fe80b

Please sign in to comment.