Ensure object parameter is removed from edit link when closing sidebar

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 25d68d0ea05d0bf608bdc05dc3b1fb1e99fc49a6..6a4fdf6ab60dabf3f6d9730749b5447fc700f91d 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -58,16 +58,25 @@ function remoteEditHandler(bbox, select) {
  * Called as the user scrolls/zooms around to maniplate hrefs of the
  * view tab and various other links
  */
  * 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],
   $(".geolink").each(function(index, link) {
     var href = link.href.split(/[?#]/)[0],

+      args = querystring.parse(link.search.substring(1)),

       editlink = $(link).hasClass("editlink");
 
       editlink = $(link).hasClass("editlink");
 

+    delete args['node'];
+    delete args['way'];
+    delete args['relation'];
+    delete args['changeset'];
+

     if (object && editlink) {
     if (object && editlink) {

-      href += '?' + object.type + '=' + object.id;
+      args[object.type] = object.id;

     }
 
     }
 

-    var args = {
+    var query = querystring.stringify(args);
+    if (query) href += '?' + query;
+
+    args = {

       lat: loc.lat,
       lon: loc.lon || loc.lng,
       zoom: zoom
       lat: loc.lat,
       lon: loc.lon || loc.lng,
       zoom: zoom