X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9e2db4513e7ebd93bf47898774348957192e11b4..35fbcf28154b6f15f697018016fbabc952e018a5:/app/assets/javascripts/index.js?ds=sidebyside diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index d96bbad4a..01682d5f8 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -7,6 +7,8 @@ //= require leaflet.share //= require leaflet.polyline //= require leaflet.query +//= require leaflet.contextmenu +//= require index/contextmenu //= require index/search //= require index/browse //= require index/export @@ -75,9 +77,42 @@ $(document).ready(function () { var params = OSM.mapParams(); + // TODO internationalisation of the context menu strings var map = new L.OSM.Map("map", { zoomControl: false, - layerControl: false + layerControl: false, + contextmenu: true, + contextmenuWidth: 140, + contextmenuItems: [{ + text: 'Directions from here', + callback: function(e){ context_directionsfrom(e, map) } + }, { + text: 'Directions to here', + callback: function(e){ context_directionsto(e, map) } + }, '-', { + text: 'Add a note here', + callback: function(e){ context_addnote(e, map) } + }, { + text: 'Show address', + callback: function(e){ context_describe(e, map) } + }, { + text: 'Query features', + callback: function(e){ context_queryhere(e, map) } + }, { + text: 'Centre map here', + callback: function(e){ context_centrehere(e, map) } + }] + }); + + $(document).on('mousedown', function(e){ + if(e.shiftKey){ + map.contextmenu.disable(); // on firefox, shift disables our contextmenu. we explicitly do this for all browsers. + }else{ + map.contextmenu.enable(); + // we also decide whether to disable some options that only like high zoom + map.contextmenu.setDisabled(3, map.getZoom() < 12); + map.contextmenu.setDisabled(5, map.getZoom() < 14); + } }); map.attributionControl.setPrefix(''); @@ -165,15 +200,6 @@ $(document).ready(function () { $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" }); }); - if ($.cookie('_osm_donatedone2015') === 'hide') { - $('#donate').hide(); - } - - $('#donate .close').on('click', function() { - $('#donate').hide(); - $.cookie("_osm_donatedone2015", 'hide', { expires: expiry }); - }); - if ($.cookie('_osm_welcome') === 'hide') { $('.welcome').hide(); }