Refactor to map.updateLayers

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 83c17b6ecfca4281de4cf3a6652c5d78640dd76a..f66f231efc3a7c008322a7d8a5045a0ab69c5afd 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -10,13 +10,12 @@
 //= require leaflet
 //= require leaflet.osm
 //= require leaflet.hash
 //= 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 richtext
 //= require querystring
 
 //= require richtext
 //= require querystring
 


@@ -63,9 +62,10 @@ 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));
+      args = querystring.parse(link.search.substring(1)),
+      editlink = $(link).hasClass("editlink");

 
 

-    if (object && $(link).hasClass("object")) args[object.type] = object.id;
+    if (object && editlink) args[object.type] = object.id;

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


@@ -76,7 +76,7 @@ function updatelinks(loc, zoom, layers, object) {
       zoom: zoom
     };
 
       zoom: zoom
     };
 

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

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


@@ -131,7 +131,8 @@ $(document).ready(function () {
   var auth_token = $("meta[name=csrf-token]").attr("content");
   $("form input[name=authenticity_token]").val(auth_token);
 
   var auth_token = $("meta[name=csrf-token]").attr("content");
   $("form input[name=authenticity_token]").val(auth_token);
 

-  $("#menu-icon").on("click", function() {
+  $("#menu-icon").on("click", function(e) {
+    e.preventDefault();

     $("header").toggleClass("closed");
   });
 
     $("header").toggleClass("closed");
   });