Merge branch 'master' into notes

[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 779ae1ab086d1ceda39d84ed74c073bc2b0471b7..5ecaca7dd61c3f20d3db0eff4dbc4eca16f7a8a5 100644 (file)
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -20,18 +20,19 @@ $(document).ready(function () {
   function createNote(feature, form) {
     var location = unproj(feature.geometry.getBounds().getCenterLonLat());
 
+    $(form).find("input[type=submit]").prop("disabled", true);
+
     $.ajax($("#createnoteanchor").attr("href"), {
       type: "POST",
       data: {
         lon: location.lon,
         lat: location.lat,
-        text: $(form.comment).val()
+        text: $(form.text).val()
       },
       success: function (data) {
         map.noteSelector.unselect(feature);
 
-        feature.attributes.status = "open";
-        feature.attributes.id = data;
+        feature.attributes = data.properties;
 
         map.noteLayer.drawFeature(feature);
 
@@ -43,6 +44,8 @@ $(document).ready(function () {
   function updateNote(feature, form, close) {
     var url = close ? feature.attributes.close_url : feature.attributes.comment_url;
 
+    $(form).find("input[type=submit]").prop("disabled", true);
+
     $.ajax(url, {
       type: "POST",
       data: {