Fix accumulation of parameters in edit link

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index c1f6af00495839c1d5ea9a0fa16eb20aa87dfcc5..25d68d0ea05d0bf608bdc05dc3b1fb1e99fc49a6 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -61,15 +61,13 @@ 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 && editlink) 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
@@ -121,21 +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");
+    $("header").toggleClass("closed");
   });
 
-  $(".nav.primary li a").on("click", function() {
-    $("#header").toggleClass("closed");
+  $("nav.primary li a").on("click", function() {
+    $("header").toggleClass("closed");
   });
 });