From: Tom Hughes <tom@compton.nu>
Date: Mon, 13 May 2013 20:14:18 +0000 (+0100)
Subject: Preserve in progress note comments when the map is moved
X-Git-Tag: live~5004
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5e420d9e50af1caca380c2ad22932f9d5ca26821?ds=sidebyside

Preserve in progress note comments when the map is moved
---

diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb
index b7331005b..7e197b09e 100644
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -87,7 +87,10 @@ $(document).ready(function () {
     if (marker)
     {
       marker.setIcon(noteIcons[feature.properties.status]);
-      marker._popup.setContent(createPopupContent(marker, feature.properties));
+      marker._popup.setContent(createPopupContent(
+        marker, feature.properties, 
+        $(marker._popup._content).find("textarea").val()
+      ));
     }
     else
     {
@@ -153,7 +156,7 @@ $(document).ready(function () {
     };
   }
 
-  function createPopupContent(marker, properties) {
+  function createPopupContent(marker, properties, comment) {
     var content = $(JST["templates/notes/show"]({ note: properties }));
 
     content.find("textarea").on("input", function (e) {
@@ -174,6 +177,10 @@ $(document).ready(function () {
       updateNote(marker, e.target.form, data.method, data.url);
     });
 
+    if (comment) {
+      content.find("textarea").val(comment).trigger("input");
+    }
+
     return content[0];
   }