Fix note commenting

[rails.git] / 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 9e92c9a1fb7c968e0790db391d3d1a103a41d931..5022cfb809b0740f657513af6e8ef96df310047e 100644 (file)
--- a/app/assets/javascripts/index/note.js.erb
+++ b/app/assets/javascripts/index/note.js.erb
@@ -1,80 +1,95 @@
-OSM.Note = function(map) {
-    var noteLayer = map.noteLayer,
-        content = $('#sidebar_content'),
-        page = {};
+OSM.Note = function (map) {
+  var noteLayer = map.noteLayer,
+    content = $('#sidebar_content'),
+    page = {},
+    noteState = map.hasLayer(noteLayer),
+    halo;
 
-    var noteIcons = {
-        "new": L.icon({
-            iconUrl: "<%= image_path('new_note_marker.png') %>",
-            iconSize: [25, 40],
-            iconAnchor: [12, 40]
-        }),
-        "open": L.icon({
-            iconUrl: "<%= image_path('open_note_marker.png') %>",
-            iconSize: [25, 40],
-            iconAnchor: [12, 40]
-        }),
-        "closed": L.icon({
-            iconUrl: "<%= image_path('closed_note_marker.png') %>",
-            iconSize: [25, 40],
-            iconAnchor: [12, 40]
-        })
-    };
+  var noteIcons = {
+    "new": L.icon({
+      iconUrl: "<%= image_path('new_note_marker.png') %>",
+      iconSize: [25, 40],
+      iconAnchor: [12, 40]
+    }),
+    "open": L.icon({
+      iconUrl: "<%= image_path('open_note_marker.png') %>",
+      iconSize: [25, 40],
+      iconAnchor: [12, 40]
+    }),
+    "closed": L.icon({
+      iconUrl: "<%= image_path('closed_note_marker.png') %>",
+      iconSize: [25, 40],
+      iconAnchor: [12, 40]
+    })
+  };
 
-    function updateNote(marker, form, method, url) {
-        $(form).find("input[type=submit]").prop("disabled", true);
+  function updateNote(marker, form, method, url) {
+    $(form).find("input[type=submit]").prop("disabled", true);
 
-        $.ajax({
-            url: url,
-            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 {
-                    marker.setIcon(noteIcons[feature.properties.status]);
-                    page.load();
-                }
-            }
-        });
-    }
+    $.ajax({
+      url: url,
+      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]);
+        }
+        OSM.loadSidebarContent(window.location.pathname, page.load);
+      }
+    });
+  }
+
+  page.pushstate = page.popstate = function (path) {
+    OSM.loadSidebarContent(path, page.load);
+  };
 
-    function bind() {
-        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);
-        });
+  page.load = function () {
+    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);
+    });
 
-        content.find("textarea").on("input", function (e) {
-            var form = e.target.form;
+    content.find("textarea").on("input", function (e) {
+      var form = e.target.form;
 
-            if ($(e.target).val() == "") {
-                $(form.close).val(I18n.t("javascripts.notes.show.resolve"));
-                $(form.comment).prop("disabled", true);
-            } else {
-                $(form.close).val(I18n.t("javascripts.notes.show.comment_and_resolve"));
-                $(form.comment).prop("disabled", false);
-            }
-        });
+      if ($(e.target).val() == "") {
+        $(form.close).val(I18n.t("javascripts.notes.show.resolve"));
+        $(form.comment).prop("disabled", true);
+      } else {
+        $(form.close).val(I18n.t("javascripts.notes.show.comment_and_resolve"));
+        $(form.comment).prop("disabled", false);
+      }
+    });
 
-        content.find("textarea").val('').trigger("input");
+    content.find("textarea").val('').trigger("input");
+
+    var data = $('.details').data();
+    if (!noteState) map.addLayer(noteLayer);
+    if (window.location.hash == "") {
+      var coords = data.coordinates.split(',');
+      map.getZoom() > 15 ? map.panTo(coords) : map.setView(coords, 16);
     }
 
-    page.pushstate = page.popstate = function() {
-        page.load();
-    };
+    if (!map.hasLayer(halo)) {
+      halo = L.circleMarker(data.coordinates.split(','), {
+        weight: 2.5,
+        radius: 20,
+        fillOpacity: 0.5,
+        color: "#FF6200"
+      });
+      map.addLayer(halo);
+    }
+  };
 
-    page.load = function() {
-        $('#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();
-        });
-    };
+  page.unload = function () {
+    if (map.hasLayer(halo)) map.removeLayer(halo);
+    if (!noteState) map.removeLayer(noteLayer);
+  };
 
-    return page;
+  return page;
 };