Merge remote-tracking branch 'jfirebaugh/562'

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index c1f6af00495839c1d5ea9a0fa16eb20aa87dfcc5..37172f4398849e9bc990ac5f5c77d3375e07e159 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -58,13 +58,20 @@ function remoteEditHandler(bbox, select) {
  * Called as the user scrolls/zooms around to maniplate hrefs of the
  * view tab and various other links
  */
-function updatelinks(loc, zoom, layers, object) {
+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;
+    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;
@@ -121,21 +128,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");
   });
 });