From da111bc702399ce393e96a5297e2db072b7f59ce Mon Sep 17 00:00:00 2001 From: Jack Allnutt Date: Mon, 24 Sep 2012 00:28:07 +0100 Subject: [PATCH] Fix: Kiwi incorrectly assumes HTTP on HTTPS connection --- client_backbone/dev/model_application.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/client_backbone/dev/model_application.js b/client_backbone/dev/model_application.js index 7a1f88f..9952ac2 100755 --- a/client_backbone/dev/model_application.js +++ b/client_backbone/dev/model_application.js @@ -72,16 +72,10 @@ kiwi.model.Application = function () { // If running from file, default to localhost:7777 by default if (window.location.protocol === 'file') { this.kiwi_server = 'http://localhost:7777'; - } else { // Assume the kiwi server is on the same server - var proto = window.location.protocol === 'https' ? - 'https' : - 'http'; - - this.kiwi_server = proto + '://' + window.location.host; + this.kiwi_server = window.location.protocol + '//' + window.location.host; } - }; -- 2.25.1