From c42136d537372f3fdf2310111d4505b72a39957e Mon Sep 17 00:00:00 2001 From: Will Rouesnel Date: Mon, 22 Apr 2013 20:07:20 +1000 Subject: [PATCH] Add default port logic to include/ui.js Correctly identifies the use of http/https and forces the value of port to 80 and 443 respectively, as in this situation window.location.port is blank. This is patch includes the same changes as made in vnc_auto.html --- include/ui.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/ui.js b/include/ui.js index 25bf162b..e9880af4 100644 --- a/include/ui.js +++ b/include/ui.js @@ -55,6 +55,18 @@ start: function(callback) { // call twice to get around webkit bug WebUtil.selectStylesheet(UI.getSetting('stylesheet')); + // if port == 80 (or 443) then it won't be present and should be + // 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') { + port = 443; + } + } + /* Populate the controls if defaults are provided in the URL */ UI.initSetting('host', window.location.hostname); UI.initSetting('port', window.location.port);