X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/aa20398cea1c212f27d9004170bdc0aee4d8f854..39468944:/app/assets/javascripts/application.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e244d8b30..25d68d0ea 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,20 +61,19 @@ 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));
+      editlink = $(link).hasClass("editlink");
 
-    if (object && $(link).hasClass("object")) args[object.type] = object.id;
-
-    var query = querystring.stringify(args);
-    if (query) href += '?' + query;
+    if (object && editlink) {
+      href += '?' + object.type + '=' + object.id;
+    }
 
-    args = {
+    var args = {
       lat: loc.lat,
       lon: loc.lon || loc.lng,
       zoom: zoom
     };
 
-    if (layers && $(link).hasClass("layers")) {
+    if (layers && !editlink) {
       args.layers = layers;
     }
 
@@ -122,12 +119,13 @@ function minimiseMap() {
   $("#content").removeClass("maximised");
 }
 
-/*
- * Forms which have been cached by rails may have the wrong
- * authenticity token, so patch up any forms with the correct
- * token taken from the page header.
- */
 $(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(e) {
+    e.preventDefault();
+    $("header").toggleClass("closed");
+  });
+
+  $("nav.primary li a").on("click", function() {
+    $("header").toggleClass("closed");
+  });
 });