From 1e741666999f1fa8c7d6d2a8f0037f7935349e2b Mon Sep 17 00:00:00 2001 From: Darren Date: Thu, 11 Oct 2012 11:25:43 +0100 Subject: [PATCH] Extracting port+ssl from passed hostname --- client/dev/model_application.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/client/dev/model_application.js b/client/dev/model_application.js index 1f4e0e5..8bf0246 100644 --- a/client/dev/model_application.js +++ b/client/dev/model_application.js @@ -138,8 +138,21 @@ kiwi.model.Application = function () { parts.shift(); if (parts.length > 0 && parts[0]) { - // TODO: Extract the port from this hostname - defaults.server = parts[0]; + // Extract the port+ssl if we find one + if (parts[0].search(/:/) > 0) { + defaults.port = parts[0].substring(parts[0].search(/:/) + 1); + defaults.server = parts[0].substring(0, parts[0].search(/:/)); + if (defaults.port[0] === '+') { + defaults.port = parseInt(defaults.port.substring(1), 10); + defaults.ssl = true; + } else { + defaults.ssl = false; + } + + } else { + defaults.server = parts[0]; + } + parts.shift(); } -- 2.25.1