X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6ecb8dbe8e870096ec38bc628d0e3d34c490f051..5afe47e3f63031f4ec86156ca63596b90af5197e:/app/assets/javascripts/index/note.js.erb

diff --git a/app/assets/javascripts/index/note.js.erb b/app/assets/javascripts/index/note.js.erb
index afc230067..2c9e42210 100644
--- a/app/assets/javascripts/index/note.js.erb
+++ b/app/assets/javascripts/index/note.js.erb
@@ -2,8 +2,7 @@ OSM.Note = function (map) {
   var noteLayer = map.noteLayer,
     content = $('#sidebar_content'),
     page = {},
-    noteState = map.hasLayer(noteLayer),
-    halo;
+    halo, currentNote;
 
   var noteIcons = {
     "new": L.icon({
@@ -23,7 +22,7 @@ OSM.Note = function (map) {
     })
   };
 
-  function updateNote(marker, form, method, url) {
+  function updateNote(form, method, url) {
     $(form).find("input[type=submit]").prop("disabled", true);
 
     $.ajax({
@@ -31,23 +30,31 @@ OSM.Note = function (map) {
       type: method,
       oauth: true,
       data: {text: $(form.text).val()},
-      success: function (feature) {
-        marker = noteLayer.getLayer(marker);
-        if (feature.properties.status == "hidden") {
-          noteLayer.removeLayer(marker);
-        } else if (marker) {
-          marker.setIcon(noteIcons[feature.properties.status]);
-        }
-        page.load();
+      success: function () {
+        OSM.loadSidebarContent(window.location.pathname, page.load);
       }
     });
   }
 
-  function bind() {
+  page.pushstate = page.popstate = function (path) {
+    OSM.loadSidebarContent(path, function() {
+      initialize(function() {
+        var data = $('.details').data(),
+          latLng = L.latLng(data.coordinates.split(','));
+        if (!map.getBounds().contains(latLng)) moveToNote();        
+      });
+    });
+  };
+
+  page.load = function() {
+    initialize(moveToNote);
+  };
+
+  function initialize(callback) {
     content.find("input[type=submit]").on("click", function (e) {
       e.preventDefault();
       var data = $(e.target).data();
-      updateNote(data.noteId, e.target.form, data.method, data.url);
+      updateNote(e.target.form, data.method, data.url);
     });
 
     content.find("textarea").on("input", function (e) {
@@ -63,50 +70,47 @@ OSM.Note = function (map) {
     });
 
     content.find("textarea").val('').trigger("input");
-  }
 
-  page.pushstate = page.popstate = function () {
-    page.load();
-  };
+    var data = $('.details').data(),
+      latLng = L.latLng(data.coordinates.split(','));
 
-  page.load = function () {
-    var loadTimer = setTimeout(setLoading, 250);
-    $('#sidebar_content').load(window.location.pathname + "?xhr=1", function (a, b, xhr) {
-      if (xhr.getResponseHeader('X-Page-Title')) {
-        document.title = xhr.getResponseHeader('X-Page-Title');
-      }
-      bind();
-      clearTimeout(loadTimer);
-      clearLoading();
-
-      var data = $('.details').data();
-      if (!noteState) map.addLayer(noteLayer);
-      if (window.location.hash == "") map.panTo(data.coordinates.split(','));
-
-      if (!map.hasLayer(halo)) {
-          halo = L.circleMarker(data.coordinates.split(','), {
-            weight: 2.5,
-            radius: 20
-          });
-        map.addLayer(halo);
-      }
-  });
-  };
+    if (!map.hasLayer(halo)) {
+      halo = L.circleMarker(latLng, {
+        weight: 2.5,
+        radius: 20,
+        fillOpacity: 0.5,
+        color: "#FF6200"
+      });
+      map.addLayer(halo);
+    }
 
-  page.unload = function () {
-    if (map.hasLayer(halo)) map.removeLayer(halo);
-    if (!noteState) map.removeLayer(noteLayer);
+    if (map.hasLayer(currentNote)) map.removeLayer(currentNote);
+    currentNote = L.marker(latLng, {
+      icon: noteIcons[data.status],
+      opacity: 1,
+      clickable: true
+    });
+
+    map.addLayer(currentNote);
+
+    if (callback) callback();
   };
 
-  function setLoading() {
-    if ($('#browse_status').is(':empty')) {
-      $('#browse_status').append($('<p></p>').text(I18n.t('browse.start_rjs.loading')));
+  function moveToNote() {
+    var data = $('.details').data(),
+      latLng = L.latLng(data.coordinates.split(','));
+
+    if (!window.location.hash || window.location.hash.match(/^#?c[0-9]+$/)) {
+      OSM.router.withoutMoveListener(function () {
+        map.setView(latLng, 15, {reset: true});
+      });
     }
   }
 
-  function clearLoading() {
-    $('#browse_status').empty();
-  }
+  page.unload = function () {
+    if (map.hasLayer(halo)) map.removeLayer(halo);
+    if (map.hasLayer(currentNote)) map.removeLayer(currentNote);
+  };
 
   return page;
 };