Merge branch 'master' into convert_roundabout_exits

[rails.git] / app / assets / javascripts / index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 1ba2fbbdef5cc719b5799813aa03bce0cfd50870..4ea643b261e68b676ae640c9e01cc9e24ba48449 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -80,8 +80,7 @@ $(document).ready(function () {
   var map = new L.OSM.Map("map", {
     zoomControl: false,
     layerControl: false,
   var map = new L.OSM.Map("map", {
     zoomControl: false,
     layerControl: false,

-    contextmenu: true,
-    contextmenuWidth: 140
+    contextmenu: true

   });
 
   map.attributionControl.setPrefix('');
   });
 
   map.attributionControl.setPrefix('');


@@ -115,6 +114,7 @@ $(document).ready(function () {
     .removeClass('leaflet-control-locate leaflet-bar')
     .addClass('control-locate')
     .children("a")
     .removeClass('leaflet-control-locate leaflet-bar')
     .addClass('control-locate')
     .children("a")

+    .attr('href', '#')

     .removeClass('leaflet-bar-part leaflet-bar-part-single')
     .addClass('control-button');
 
     .removeClass('leaflet-bar-part leaflet-bar-part-single')
     .addClass('control-button');
 


@@ -241,9 +241,7 @@ $(document).ready(function () {
 
   function remoteEditHandler(bbox, object) {
     var loaded = false,
 
   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 = "http://127.0.0.1:8111/load_and_zoom?",

         query = {
           left: bbox.getWest() - 0.0001,
           top: bbox.getNorth() + 0.0001,
         query = {
           left: bbox.getWest() - 0.0001,
           top: bbox.getNorth() + 0.0001,