From 8d2681ae3fdd126aa34e105ba61aaa82f9c158c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 7 Dec 2016 10:54:20 +0100 Subject: [PATCH] Make OctoPrint.upload's url behave like others So far only was interpreted relatively to the defined base url. We want this to behave like other requests from the client lib though, so now it does. --- src/octoprint/static/js/app/client/base.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/octoprint/static/js/app/client/base.js b/src/octoprint/static/js/app/client/base.js index dccfa67f..5d541ec4 100644 --- a/src/octoprint/static/js/app/client/base.js +++ b/src/octoprint/static/js/app/client/base.js @@ -222,7 +222,12 @@ var headers = OctoPrint.getRequestHeaders(); - request.open("POST", OctoPrint.getBaseUrl() + url); + var urlToCall = url; + if (!_.startsWith(url, "http://") && !_.startsWith(url, "https://")) { + urlToCall = OctoPrint.getBaseUrl() + url; + } + + request.open("POST", urlToCall); _.each(headers, function(value, key) { request.setRequestHeader(key, value); });