X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/15b104f4ff4614aa78c01180b6a9b89dd5a1400f..c38a50fc5f43a185dda39fd1aa235a2bda8ad83b:/app/assets/javascripts/index.js diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 00e6a9d32..ccf4e561c 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -20,6 +20,7 @@ //= require index/changeset //= require index/query //= require router +//= require bowser $(document).ready(function () { var loaderTimeout; @@ -241,9 +242,7 @@ $(document).ready(function () { function remoteEditHandler(bbox, object) { var loaded = false, - url = document.location.protocol === "https:" ? - "https://127.0.0.1:8112/load_and_zoom?" : - "http://127.0.0.1:8111/load_and_zoom?", + url, query = { left: bbox.getWest() - 0.0001, top: bbox.getNorth() + 0.0001, @@ -251,6 +250,13 @@ $(document).ready(function () { bottom: bbox.getSouth() - 0.0001 }; + if (location.protocol === 'http' || + bowser.check({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?"; + } + if (object) query.select = object.type + object.id; var iframe = $('