From 7e390ec89b58e290de0546b3fe8a51e99191310c Mon Sep 17 00:00:00 2001 From: Guillaume Rischard Date: Tue, 26 Nov 2019 18:53:54 +0000 Subject: [PATCH] Always use http to talk to josm See discussion in #2445 and resulting conclusion that JOSM no longer even listens on the https port. Closes #2446 --- app/assets/javascripts/index.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 2087886fa..66a24f16a 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -24,8 +24,7 @@ //= require querystring $(document).ready(function () { - var querystring = require("querystring-component"), - browser = bowser.getParser(window.navigator.userAgent); + var querystring = require("querystring-component"); var loaderTimeout; @@ -256,12 +255,7 @@ $(document).ready(function () { bottom: bbox.getSouth() - 0.0001 }; - if (location.protocol === "http" || - browser.satisfies({ chrome: ">=53", firefox: ">=55" })) { - url = "http://127.0.0.1:8111/load_and_zoom?"; - } else { - url = "https://127.0.0.1:8112/load_and_zoom?"; - } + url = "http://127.0.0.1:8111/load_and_zoom?"; if (object) query.select = object.type + object.id; -- 2.43.2