X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e731dd71a77ad4ad1e9db22535e89444bb98e5d9..7a81258ddc7ece9e9f641083acfbc555bdedc009:/app/assets/javascripts/index.js?ds=sidebyside diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 562eb80fd..6584864d5 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -20,7 +20,6 @@ //= require index/changeset //= require index/query //= require router -//= require bowser //= require querystring $(document).ready(function () { @@ -110,6 +109,8 @@ $(document).ready(function () { iconLoading: "icon geolocate", strings: { title: I18n.t("javascripts.map.locate.title"), + metersUnit: I18n.t("javascripts.map.locate.metersUnit"), + feetUnit: I18n.t("javascripts.map.locate.feetUnit"), popup: I18n.t("javascripts.map.locate.popup") } }).addTo(map); @@ -255,12 +256,7 @@ $(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?"; - } + url = "http://127.0.0.1:8111/load_and_zoom?"; if (object) query.select = object.type + object.id; @@ -347,8 +343,8 @@ $(document).ready(function () { }); } }); - - $('.colour-preview-box').each(function () { + + $(".colour-preview-box").each(function () { $(this).css("background-color", $(this).data("colour")); }); }