X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/774aa0c875157f8a1322920d0498c80025abadc6..d380ce79aabcd98ade3eabe8f982e516311f6aee:/app/assets/javascripts/application.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e1c75d70f..2c186c909 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -9,14 +9,12 @@
 //= require osm
 //= require leaflet
 //= require leaflet.osm
-//= require leaflet.hash
+//= require leaflet.map
 //= require leaflet.zoom
-//= require leaflet.extend
 //= require leaflet.locationfilter
 //= require i18n/translations
 //= require oauth
 //= require piwik
-//= require map
 //= require richtext
 //= require querystring
 
@@ -63,9 +61,10 @@ function remoteEditHandler(bbox, select) {
 function updatelinks(loc, zoom, layers, object) {
   $(".geolink").each(function(index, link) {
     var href = link.href.split(/[?#]/)[0],
-        args = querystring.parse(link.search.substring(1));
+      args = querystring.parse(link.search.substring(1)),
+      editlink = $(link).hasClass("editlink");
 
-    if (object && $(link).hasClass("object")) args[object.type] = object.id;
+    if (object && editlink) args[object.type] = object.id;
 
     var query = querystring.stringify(args);
     if (query) href += '?' + query;
@@ -76,7 +75,7 @@ function updatelinks(loc, zoom, layers, object) {
       zoom: zoom
     };
 
-    if (layers && $(link).hasClass("layers")) {
+    if (layers && !editlink) {
       args.layers = layers;
     }
 
@@ -131,9 +130,12 @@ $(document).ready(function () {
   var auth_token = $("meta[name=csrf-token]").attr("content");
   $("form input[name=authenticity_token]").val(auth_token);
 
-  $("#menu-icon").on("click", function() {
+  $("#menu-icon").on("click", function(e) {
+    e.preventDefault();
     $("header").toggleClass("closed");
   });
 
-  $('#ad .close').on("click", function() { $('#ad').remove(); });
+  $("nav.primary li a").on("click", function() {
+    $("header").toggleClass("closed");
+  });
 });