Include layers in all geolinks except edit

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index f1a13132c6b305bab642fef8c744a44ef09cb159..1cd6e224df3caca4edc27eee830063e3249c0e2c 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -63,9 +63,10 @@ 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) args[object.type] = object.id;
 
     var query = querystring.stringify(args);
     if (query) href += '?' + query;
@@ -76,7 +77,7 @@ function updatelinks(loc, zoom, layers, object) {
       zoom: zoom
     };
 
-    if (layers && $(link).hasClass("layers")) {
+    if (layers && !editlink) {
       args.layers = layers;
     }
 

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index b0631b43127ead4dff1c6aa3f4c85541f2264ff1..1142eeb79c055c49b36985320118da768ade9bb5 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,6 +1,6 @@
 <header class="closed">
   <h1>
-    <a href="<%= root_path %>" class="geolink layers">
+    <a href="<%= root_path %>" class="geolink">
       <%= image_tag "osm_logo.png", :alt => t('layouts.logo.alt_text'), :class => 'logo' %>
       <%= t 'layouts.project_name.h1' %>
     </a>
@@ -9,7 +9,7 @@
   <nav class='primary'>
     <ul>
       <li id="edit_tab" class="dropdown <%= current_page_class(edit_path) %>">
-        <%= link_to t('layouts.edit'), edit_path, :class => "tab geolink object",
+        <%= link_to t('layouts.edit'), edit_path, :class => "tab geolink editlink",
                     :id => 'editanchor',
                     :data => { :editor => preferred_editor }
         %><a class='dropdown-toggle' data-toggle='dropdown' href='#'><b class="caret"></b></a>
@@ -19,7 +19,7 @@
               <%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")),
                           edit_path(:editor => editor),
                           :data => { :editor => editor },
-                          :class => "geolink object" %>
+                          :class => "geolink editlink" %>
             </li>
           <% end %>
         </ul>