Force the X-Page-Title value to be treated as UTF-8

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index f1a13132c6b305bab642fef8c744a44ef09cb159..bc8719700aa217b53aff1bd8676db0fcc44f9e2d 100644 (file)
--- 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,17 @@ 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) {
+      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;
@@ -76,7 +82,7 @@ function updatelinks(loc, zoom, layers, object) {
       zoom: zoom
     };
 
-    if (layers && $(link).hasClass("layers")) {
+    if (layers && !editlink) {
       args.layers = layers;
     }
 
@@ -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");