Pass the correct ID when switching to a node/way/relation view

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index a0ddcf9c2b0b0b14e643f693fcfc4a6298afe8d8..25d68d0ea05d0bf608bdc05dc3b1fb1e99fc49a6 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -9,17 +9,13 @@
 //= require osm
 //= require leaflet
 //= require leaflet.osm
 //= require osm
 //= require leaflet
 //= require leaflet.osm

-//= require leaflet.hash
+//= require leaflet.map

 //= require leaflet.zoom
 //= require leaflet.zoom

-//= require leaflet.extend

 //= require leaflet.locationfilter
 //= require i18n/translations
 //= require oauth
 //= require piwik
 //= require leaflet.locationfilter
 //= require i18n/translations
 //= require oauth
 //= require piwik

-//= require map
-//= require sidebar

 //= require richtext
 //= require richtext

-//= require geocoder

 //= require querystring
 
 var querystring = require('querystring-component');
 //= require querystring
 
 var querystring = require('querystring-component');


@@ -65,20 +61,19 @@ function remoteEditHandler(bbox, select) {
 function updatelinks(loc, zoom, layers, object) {
   $(".geolink").each(function(index, link) {
     var href = link.href.split(/[?#]/)[0],
 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 && $(link).hasClass("object")) 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
     };
 
       lat: loc.lat,
       lon: loc.lon || loc.lng,
       zoom: zoom
     };
 

-    if (layers && $(link).hasClass("layers")) {
+    if (layers && !editlink) {

       args.layers = layers;
     }
 
       args.layers = layers;
     }
 


@@ -116,12 +111,21 @@ function escapeHTML(string) {
   });
 }
 
   });
 }
 

-/*
- * 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.
- */
+function maximiseMap() {
+  $("#content").addClass("maximised");
+}
+
+function minimiseMap() {
+  $("#content").removeClass("maximised");
+}
+

 $(document).ready(function () {
 $(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");
+  });
+
+  $("nav.primary li a").on("click", function() {
+    $("header").toggleClass("closed");
+  });

 });
 });