Move remaining inline changeset JS to changeset.js

diff --git a/app/assets/javascripts/changeset.js b/app/assets/javascripts/changeset.js
index 094605661f61b3418c16990f16b48c4ef5bfafb8..ba6e541b6b3b2ff202592b579692c5baa0fbbd3b 100644 (file)
--- a/app/assets/javascripts/changeset.js
+++ b/app/assets/javascripts/changeset.js
@@ -1,34 +1,34 @@
-var highlight;
+$(document).ready(function () {
+  var highlight;

 
 

-function highlightChangeset(id) {
-  var feature = vectors.getFeatureByFid(id);
-  var bounds = feature.geometry.getBounds();
+  function highlightChangeset(id) {
+    var feature = vectors.getFeatureByFid(id);
+    var bounds = feature.geometry.getBounds();

 
 

-  if (bounds.containsBounds(map.getExtent())) {
-    bounds = map.getExtent().scale(1.1);
-  }
+    if (bounds.containsBounds(map.getExtent())) {
+      bounds = map.getExtent().scale(1.1);
+    }

 
 

-  if (highlight) vectors.removeFeatures(highlight);
+    if (highlight) vectors.removeFeatures(highlight);

 
 

-  highlight = new OpenLayers.Feature.Vector(bounds.toGeometry(), {}, {
-    strokeWidth: 2,
-    strokeColor: "#ee9900",
-    fillColor: "#ffff55",
-    fillOpacity: 0.5
-  });
+    highlight = new OpenLayers.Feature.Vector(bounds.toGeometry(), {}, {
+      strokeWidth: 2,
+      strokeColor: "#ee9900",
+      fillColor: "#ffff55",
+      fillOpacity: 0.5
+    });

 
 

-  vectors.addFeatures(highlight);
+    vectors.addFeatures(highlight);

 
 

-  $("#tr-changeset-" + id).addClass("selected");
-}
+    $("#tr-changeset-" + id).addClass("selected");
+  }

 
 

-function unHighlightChangeset(id) {
-  vectors.removeFeatures(highlight);
+  function unHighlightChangeset(id) {
+    vectors.removeFeatures(highlight);

 
 

-  $("#tr-changeset-" + id).removeClass("selected");
-}
+    $("#tr-changeset-" + id).removeClass("selected");
+  }

 
 

-$(document).ready(function () {

   var map = createMap("changeset_list_map", {
     controls: [
       new OpenLayers.Control.Navigation(),
   var map = createMap("changeset_list_map", {
     controls: [
       new OpenLayers.Control.Navigation(),


@@ -72,4 +72,12 @@ $(document).ready(function () {
   } else {
     map.zoomToExtent(proj(bounds));
   }
   } else {
     map.zoomToExtent(proj(bounds));
   }

+
+  $("[data-changeset]").mouseover(function() {
+    highlightChangeset($(this).data("changeset").id);
+  });
+
+  $("[data-changeset]").mouseout(function() {
+    unHighlightChangeset($(this).data("changeset").id);
+  });

 });
 });

diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb
index ec4bef0adbef3701a5ad6638f737e1357aa1b581..ba963ea8e262d071d7cc6375285d4a771c5711a0 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -48,13 +48,3 @@
     <% end %>
   </td>
 <% end %>
     <% end %>
   </td>
 <% end %>

-
-<script type="text/javascript">
-$("#tr-changeset-<%= changeset.id%>").mouseover(function() {
-  highlightChangeset("<%= changeset.id %>");
-});
-
-$("#tr-changeset-<%= changeset.id%>").mouseout(function() {
-  unHighlightChangeset("<%= changeset.id %>");
-});
-</script>