]> git.openstreetmap.org Git - rails.git/commitdiff
Always use http to talk to josm
authorGuillaume Rischard <git@stereo.lu>
Tue, 26 Nov 2019 18:53:54 +0000 (18:53 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 26 Nov 2019 18:53:54 +0000 (18:53 +0000)
See discussion in #2445 and resulting conclusion that JOSM no
longer even listens on the https port.

Closes #2446

app/assets/javascripts/index.js

index 2087886fa7693e3ce3beaae36047120327da3db3..66a24f16aa01b6ba37aa951c3a21ce493e7a6d17 100644 (file)
@@ -24,8 +24,7 @@
 //= require querystring
 
 $(document).ready(function () {
 //= require querystring
 
 $(document).ready(function () {
-  var querystring = require("querystring-component"),
-      browser = bowser.getParser(window.navigator.userAgent);
+  var querystring = require("querystring-component");
 
   var loaderTimeout;
 
 
   var loaderTimeout;
 
@@ -256,12 +255,7 @@ $(document).ready(function () {
           bottom: bbox.getSouth() - 0.0001
         };
 
           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;
 
 
     if (object) query.select = object.type + object.id;