From 7ca6d4e8f7651f570196c92c94f9ca4a6b2c0e74 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 31 Aug 2014 15:38:27 +0100 Subject: [PATCH] don't make HS ports explicit if it's the default for the protocol --- webclient/login/login-controller.js | 5 ++++- webclient/login/register-controller.js | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/webclient/login/login-controller.js b/webclient/login/login-controller.js index 2b9192695..af9a61f0f 100644 --- a/webclient/login/login-controller.js +++ b/webclient/login/login-controller.js @@ -7,7 +7,10 @@ angular.module('LoginController', ['matrixService']) // Assume that this is hosted on the home server, in which case the URL // contains the home server. var hs_url = $location.protocol() + "://" + $location.host(); - if ($location.port()) { + if ($location.port() && + !($location.protocol() === "http" && $location.port() === 80) && + !($location.protocol() === "https" && $location.port() === 443)) + { hs_url += ":" + $location.port(); } var example_domain = $location.host(); diff --git a/webclient/login/register-controller.js b/webclient/login/register-controller.js index 6c1bfd632..d4fb9add7 100644 --- a/webclient/login/register-controller.js +++ b/webclient/login/register-controller.js @@ -8,7 +8,10 @@ angular.module('RegisterController', ['matrixService']) // Assume that this is hosted on the home server, in which case the URL // contains the home server. var hs_url = $location.protocol() + "://" + $location.host(); - if ($location.port()) { + if ($location.port() && + !($location.protocol() === "http" && $location.port() === 80) && + !($location.protocol() === "https" && $location.port() === 443)) + { hs_url += ":" + $location.port(); }