openstack/deb-novnc
Code Issues Proposed changes

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

Browse Source 
Re-fix pull req #245:
This commit is contained in:
Joel Martin
2013-04-25 06:14:47 -07:00
parent 5c69d747fb 647c15e77a
commit 43fe6b163a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/ui.js
View File

@@ -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 */