Add 'x' to close welcome box; remember preference

[rails.git] / app / assets / javascripts / index / notes.js.erb

diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb
index c3169ca09b396108d3d8aa5c304d7d7bdf54b887..841ae1f7bdf652096e80399782474513deb1d880 100644 (file)
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -1,7 +1,6 @@
 function initializeNotes(map) {
   var noteLayer = map.noteLayer,
 function initializeNotes(map) {
   var noteLayer = map.noteLayer,

-      notes = {},
-      newNote;
+      notes = {};

 
   var noteIcons = {
     "new": L.icon({
 
   var noteIcons = {
     "new": L.icon({


@@ -32,18 +31,11 @@ function initializeNotes(map) {
       noteLayer.clearLayers();
       notes = {};
     }
       noteLayer.clearLayers();
       notes = {};
     }

-  }).on("popupclose", function (e) {
-    if (newNote && e.popup == newNote._popup) {
-      $(newNote).oneTime(10, "removenote", function () {
-        map.removeLayer(newNote);
-        newNote = null;
-      });
-    } 
-  })
+  });

 
   noteLayer.on('click', function(e) {
 
   noteLayer.on('click', function(e) {

-    OSM.route('/browse/note/' + e.layer.id);
-  })
+    OSM.router.route('/note/' + e.layer.id);
+  });

 
   function updateMarker(marker, feature) {
     if (marker) {
 
   function updateMarker(marker, feature) {
     if (marker) {


@@ -51,7 +43,7 @@ function initializeNotes(map) {
     } else {
       marker = L.marker(feature.geometry.coordinates.reverse(), {
         icon: noteIcons[feature.properties.status],
     } else {
       marker = L.marker(feature.geometry.coordinates.reverse(), {
         icon: noteIcons[feature.properties.status],

-        opacity: 0.9,
+        opacity: 0.8,

         clickable: true
       });
       marker.id = feature.properties.id;
         clickable: true
       });
       marker.id = feature.properties.id;


@@ -92,11 +84,11 @@ function initializeNotes(map) {
         notes[feature.properties.id] = updateMarker(marker, feature);
       }
 
         notes[feature.properties.id] = updateMarker(marker, feature);
       }
 

-      for (id in oldNotes) {
+      for (var id in oldNotes) {

         noteLayer.removeLayer(oldNotes[id]);
       }
 
       noteLoader = null;
     }
         noteLayer.removeLayer(oldNotes[id]);
       }
 
       noteLoader = null;
     }

-  };
+  }

 }
 }