X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a7e67846a77722885b583a0f00ffe58b634e7eb3..5e420d9e50af1caca380c2ad22932f9d5ca26821:/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 f414f0e34..7e197b09e 100644
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -46,9 +46,12 @@ $(document).ready(function () {
     }
   });
 
-  map.on("popupopen", function (e) {
-    $(e.popup._container).find(".comment").focus();
-  });
+  // Don't focus the text area on touch devices to avoid flashing the keyboard
+  if (!('ontouchstart' in document.documentElement)) {
+    map.on("popupopen", function (e) {
+      $(e.popup._container).find(".comment").focus();
+    });
+  }
 
   map.on("popupclose", function (e) {
     if (newNote && e.popup == newNote._popup) {
@@ -84,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
     {
@@ -150,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) {
@@ -171,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];
   }