Skip to content

N
noVNC
Commit b66ffcdd authored by Peter Åstrand (astrand)'s avatar Peter Åstrand (astrand)
Browse files
Options

Re-fix pull req #245: 

* Must declare port variable.

* Must look for https first, then http.
parent e6500004
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
include/ui.js
View file @ b66ffcdd
......@@ -31,7 +31,7 @@ load: function (callback) {
// Render default UI and initialize settings menu
start: function(callback) {
var html = '', i, sheet, sheets, llevels;
var html = '', i, sheet, sheets, llevels, port;
// Stylesheet selection dropdown
sheet = WebUtil.selectStylesheet();
......@@ -59,12 +59,12 @@ start: function(callback) {
// set manually
port = window.location.port;
if (!port) {
if (window.location.protocol.substring(0,4) == 'http') {
port = 80;
}
else if (window.location.protocol.substring(0,5) == 'https') {
if (window.location.protocol.substring(0,5) == 'https') {
port = 443;
}
else if (window.location.protocol.substring(0,4) == 'http') {
port = 80;
}
}
/* Populate the controls if defaults are provided in the URL */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment