Tweak positioning of inbox count on the user menu button

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

diff --git a/app/assets/javascripts/index/contextmenu.js b/app/assets/javascripts/index/contextmenu.js
index 148ccf908441b99cc23a62da95e81c21c55484df..fdde8dec470d7e487f2f0cf05ee81661c61f67d3 100644 (file)
--- a/app/assets/javascripts/index/contextmenu.js
+++ b/app/assets/javascripts/index/contextmenu.js
@@ -1,4 +1,8 @@
+//= require querystring
+

 OSM.initializeContextMenu = function (map) {
 OSM.initializeContextMenu = function (map) {

+  var querystring = require("querystring-component");
+

   map.contextmenu.addItem({
     text: I18n.t("javascripts.context.directions_from"),
     callback: function directionsFromHere(e) {
   map.contextmenu.addItem({
     text: I18n.t("javascripts.context.directions_from"),
     callback: function directionsFromHere(e) {


@@ -8,7 +12,8 @@ OSM.initializeContextMenu = function (map) {
           lng = latlng.lng.toFixed(precision);
 
       OSM.router.route("/directions?" + querystring.stringify({
           lng = latlng.lng.toFixed(precision);
 
       OSM.router.route("/directions?" + querystring.stringify({

-        route: lat + "," + lng + ";" + $("#route_to").val()
+        from: lat + "," + lng,
+        to: $("#route_to").val()

       }));
     }
   });
       }));
     }
   });


@@ -22,7 +27,8 @@ OSM.initializeContextMenu = function (map) {
           lng = latlng.lng.toFixed(precision);
 
       OSM.router.route("/directions?" + querystring.stringify({
           lng = latlng.lng.toFixed(precision);
 
       OSM.router.route("/directions?" + querystring.stringify({

-        route: $("#route_from").val() + ";" + lat + "," + lng
+        from: $("#route_from").val(),
+        to: lat + "," + lng

       }));
     }
   });
       }));
     }
   });


@@ -47,7 +53,7 @@ OSM.initializeContextMenu = function (map) {
           lat = latlng.lat.toFixed(precision),
           lng = latlng.lng.toFixed(precision);
 
           lat = latlng.lat.toFixed(precision),
           lng = latlng.lng.toFixed(precision);
 

-      OSM.router.route("/search?query=" + encodeURIComponent(lat + "," + lng));
+      OSM.router.route("/search?whereami=1&query=" + encodeURIComponent(lat + "," + lng));

     }
   });
 
     }
   });
 


@@ -75,7 +81,7 @@ OSM.initializeContextMenu = function (map) {
     else map.contextmenu.enable();
   });
 
     else map.contextmenu.enable();
   });
 

-  var updateMenu = function updateMenu () {
+  var updateMenu = function updateMenu() {

     map.contextmenu.setDisabled(2, map.getZoom() < 12);
     map.contextmenu.setDisabled(4, map.getZoom() < 14);
   };
     map.contextmenu.setDisabled(2, map.getZoom() < 12);
     map.contextmenu.setDisabled(4, map.getZoom() < 14);
   };