X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/392b68a65fd6ffa521b89e079b234bb0241380d3..25f27a753f6a79bc1ae494e42cf03b9880d0bdcd:/app/assets/javascripts/index.js?ds=sidebyside

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 1ba2fbbde..e8e566f53 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;
@@ -80,8 +81,7 @@ $(document).ready(function () {
   var map = new L.OSM.Map("map", {
     zoomControl: false,
     layerControl: false,
-    contextmenu: true,
-    contextmenuWidth: 140
+    contextmenu: true
   });
 
   map.attributionControl.setPrefix('');
@@ -115,6 +115,7 @@ $(document).ready(function () {
     .removeClass('leaflet-control-locate leaflet-bar')
     .addClass('control-locate')
     .children("a")
+    .attr('href', '#')
     .removeClass('leaflet-bar-part leaflet-bar-part-single')
     .addClass('control-button');
 
@@ -186,12 +187,12 @@ $(document).ready(function () {
     $.cookie('_osm_location', OSM.locationCookie(map), { expires: expiry, path: '/' });
   });
 
-  if ($.cookie('_osm_welcome') === 'hide') {
-    $('.welcome').hide();
+  if ($.cookie('_osm_welcome') !== 'hide') {
+    $('.welcome').addClass('visible');
   }
 
   $('.welcome .close-wrap').on('click', function() {
-    $('.welcome').hide();
+    $('.welcome').removeClass('visible');
     $.cookie('_osm_welcome', 'hide', { expires: expiry, path: '/' });
   });
 
@@ -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 = $('<iframe>')