Revert 39468944 and fix osmlab#91 without loosing the editor choice

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index f66f231efc3a7c008322a7d8a5045a0ab69c5afd..bc8719700aa217b53aff1bd8676db0fcc44f9e2d 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -9,7 +9,6 @@
 //= require osm
 //= require leaflet
 //= require leaflet.osm
-//= require leaflet.hash
 //= require leaflet.map
 //= require leaflet.zoom
 //= require leaflet.locationfilter
@@ -65,7 +64,14 @@ function updatelinks(loc, zoom, layers, object) {
       args = querystring.parse(link.search.substring(1)),
       editlink = $(link).hasClass("editlink");
 
-    if (object && editlink) args[object.type] = object.id;
+    if (object && editlink) {
+      delete args['node'];
+      delete args['way'];
+      delete args['relation'];
+      delete args['changeset'];
+
+      args[object.type] = object.id;
+    }
 
     var query = querystring.stringify(args);
     if (query) href += '?' + query;
@@ -122,15 +128,7 @@ 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");