Improved noteLayer and dataLayer availability, closes #65

[rails.git] / app / assets / javascripts / index / history.js

diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js
index f63cee25045af6fd0c2762275fb4a271675c9ba0..afae6640f87b566d8ab210bacbe18f3d8ce6b58a 100644 (file)
--- a/app/assets/javascripts/index/history.js
+++ b/app/assets/javascripts/index/history.js
@@ -29,7 +29,7 @@ OSM.History = function(map) {
   };
 
   function highlightChangeset(id) {
   };
 
   function highlightChangeset(id) {

-    group.getLayer(id).setStyle({fillOpacity: 0.5});
+    group.getLayer(id).setStyle({fillOpacity: 0.3});

     $("#changeset_" + id).addClass("selected");
   }
 
     $("#changeset_" + id).addClass("selected");
   }
 


@@ -47,7 +47,7 @@ OSM.History = function(map) {
       url: window.location.pathname,
       method: "GET",
       data: {bbox: map.getBounds().toBBoxString()},
       url: window.location.pathname,
       method: "GET",
       data: {bbox: map.getBounds().toBBoxString()},

-      success: function(html) {
+      success: function(html, status, xhr) {

         $('#sidebar_content .changesets').html(html);
         updateMap();
       }
         $('#sidebar_content .changesets').html(html);
         updateMap();
       }


@@ -91,7 +91,7 @@ OSM.History = function(map) {
     for (var i = 0; i < changesets.length; ++i) {
       var changeset = changesets[i],
         rect = L.rectangle(changeset.bounds,
     for (var i = 0; i < changesets.length; ++i) {
       var changeset = changesets[i],
         rect = L.rectangle(changeset.bounds,

-          {weight: 2, color: "#ee9900", fillColor: "#ffff55", fillOpacity: 0});
+          {weight: 1, color: "#FF9500", opacity: 1, fillColor: "#FFFFBF", fillOpacity: 0});

       rect.id = changeset.id;
       rect.addTo(group);
     }
       rect.id = changeset.id;
       rect.addTo(group);
     }


@@ -99,9 +99,7 @@ OSM.History = function(map) {
 
   page.pushstate = page.popstate = function(path) {
     $("#history_tab").addClass("current");
 
   page.pushstate = page.popstate = function(path) {
     $("#history_tab").addClass("current");

-    $("#sidebar").removeClass("minimized");
-    map.invalidateSize();
-    $("#sidebar_content").load(path, page.load);
+    OSM.loadSidebarContent(path, page.load);

   };
 
   page.load = function() {
   };
 
   page.load = function() {