Eliminate interpolation in diary entry JS

diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb
index 0952c901bb8b9976f863addb7281019dc4504da7..33e4d2719ba5d2c3caaa6e5df45eb71230866c66 100644 (file)
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -19,7 +19,7 @@
     <tr valign="top">
       <td class="fieldName"><%= t 'diary_entry.edit.location' -%></td>
       <td>
     <tr valign="top">
       <td class="fieldName"><%= t 'diary_entry.edit.location' -%></td>
       <td>

-        <div id="map"></div>
+        <%= content_tag "div", "", :id => "map", :data => {:lat => @lat, :lon => @lon, :zoom => @zoom} %>

         <span class="location"><%= t 'diary_entry.edit.latitude' -%> <%= f.text_field :latitude, :size => 20, :id => "latitude" %> <%= t 'diary_entry.edit.longitude' -%> <%= f.text_field :longitude, :size => 20, :id => "longitude" %></span>
         <a href="javascript:openMap()" id="usemap"><%= t 'diary_entry.edit.use_map_link' -%></a>
         <br/><br/>
         <span class="location"><%= t 'diary_entry.edit.latitude' -%> <%= f.text_field :latitude, :size => 20, :id => "latitude" %> <%= t 'diary_entry.edit.longitude' -%> <%= f.text_field :longitude, :size => 20, :id => "longitude" %></span>
         <a href="javascript:openMap()" id="usemap"><%= t 'diary_entry.edit.use_map_link' -%></a>
         <br/><br/>


@@ -51,23 +51,22 @@
       removeMarkerFromMap(marker);
     }
 
       removeMarkerFromMap(marker);
     }
 

-    marker = addMarkerToMap(lonlat, null, "<%= t 'diary_entry.edit.marker_text' -%>");
+    marker = addMarkerToMap(lonlat, null, I18n.t('diary_entry.edit.marker_text'));

   }
 
   function openMap() {
     $("#map").show();
     $("#usemap").hide();
 
   }
 
   function openMap() {
     $("#map").show();
     $("#usemap").hide();
 

-    var centre = new OpenLayers.LonLat(<%= @lon %>, <%= @lat %>);
-    var zoom = <%= @zoom %>;
-
+    var params = $("#map").data();
+    var centre = new OpenLayers.LonLat(params.lon, params.lat);

     var map = createMap("map");
 
     var map = createMap("map");
 

-    setMapCenter(centre, zoom);
+    setMapCenter(centre, params.zoom);

 
 

-    <% if @diary_entry.latitude and @diary_entry.longitude %>
-    marker = addMarkerToMap(centre, null, "<%= t 'diary_entry.edit.marker_text' -%>");
-    <% end %>
+    if ($("#latitude").val() && $("#longitude").val()) {
+      marker = addMarkerToMap(centre, null, I18n.t('diary_entry.edit.marker_text'));
+    }

 
     map.events.register("click", map, setLocation);
   }
 
     map.events.register("click", map, setLocation);
   }

diff --git a/config/i18n-js.yml b/config/i18n-js.yml
index 29855fe48ce47baf0d5dd1ea9e69144ce04b1062..982d60da74b5a24326adceb1c1c3f1e346f3e139 100644 (file)
--- a/config/i18n-js.yml
+++ b/config/i18n-js.yml
@@ -28,3 +28,4 @@ translations:
     - "*.javascripts.*"
     - "*.site.index.remote_failed"
     - "*.site.sidebar.search_results"
     - "*.javascripts.*"
     - "*.site.index.remote_failed"
     - "*.site.sidebar.search_results"

+    - "*.diary_entry.edit.marker_text"