Skip to content

N
noVNC
Commit 8f12ca7a authored by Joel Martin's avatar Joel Martin
Browse files
Options

Merge pull request #252 from astrand/port-80-443 

Re-fix pull req #245:
parents e6500004 b66ffcdd
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
include/ui.js
View file @ 8f12ca7a
...@@ -31,7 +31,7 @@ load: function (callback) { ...@@ -31,7 +31,7 @@ load: function (callback) {
// Render default UI and initialize settings menu // Render default UI and initialize settings menu
start: function(callback) { start: function(callback) {
var html = '', i, sheet, sheets, llevels; var html = '', i, sheet, sheets, llevels, port;
// Stylesheet selection dropdown // Stylesheet selection dropdown
sheet = WebUtil.selectStylesheet(); sheet = WebUtil.selectStylesheet();
...@@ -59,12 +59,12 @@ start: function(callback) { ...@@ -59,12 +59,12 @@ start: function(callback) {
// set manually // set manually
port = window.location.port; port = window.location.port;
if (!port) { if (!port) {
if (window.location.protocol.substring(0,4) == 'http') { if (window.location.protocol.substring(0,5) == 'https') {
port = 80;
}
else if (window.location.protocol.substring(0,5) == 'https') {
port = 443; port = 443;
} }
else if (window.location.protocol.substring(0,4) == 'http') {
port = 80;
}
} }
/* Populate the controls if defaults are provided in the URL */ /* 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