Add manual fallback for "Start Mapping" button
authorJohn Firebaugh <john.firebaugh@gmail.com>
Wed, 7 Aug 2013 23:14:15 +0000 (16:14 -0700)
committerJohn Firebaugh <john.firebaugh@gmail.com>
Mon, 12 Aug 2013 20:34:45 +0000 (13:34 -0700)
app/assets/javascripts/index.js
app/assets/javascripts/welcome.js
config/locales/en.yml

index e46ca6d..2a704f7 100644 (file)
@@ -158,6 +158,20 @@ $(document).ready(function () {
     remoteEditHandler(map.getBounds());
   }
 
+  if (OSM.params().edit_help) {
+    $('#editanchor')
+      .removeAttr('title')
+      .tooltip({
+        placement: 'bottom',
+        title: I18n.t('javascripts.edit_help')
+      })
+      .tooltip('show');
+
+    $('body').one('click', function() {
+      $('#editanchor').tooltip('hide');
+    });
+  }
+
   initializeSearch(map);
   initializeExport(map);
   initializeBrowse(map, params);
index 6064838..56c454a 100644 (file)
@@ -25,12 +25,6 @@ $(document).ready(function() {
       });
     }
 
-    function geoError() {
-      $('.start-mapping')
-        .removeClass('loading')
-        .addClass('error');
-    }
-
     $('.start-mapping').on('click', function(e) {
       e.preventDefault();
 
@@ -39,9 +33,15 @@ $(document).ready(function() {
 
       // handle firefox's weird implementation
       // https://bugzilla.mozilla.org/show_bug.cgi?id=675533
-      window.setTimeout(geoError, 4000);
+      window.setTimeout(manualEdit, 4000);
 
-      navigator.geolocation.getCurrentPosition(geoSuccess, geoError);
+      navigator.geolocation.getCurrentPosition(geoSuccess, manualEdit);
     });
+  } else {
+    manualEdit();
+  }
+
+  function manualEdit() {
+    window.location = '/?edit_help=1'
   }
 });
index 5a1cd3a..f3f4ac8 100644 (file)
@@ -2144,6 +2144,7 @@ en:
         reactivate: Reactivate
         comment_and_resolve: Comment & Resolve
         comment: Comment
+    edit_help: Move the map and zoom in on a location you want to edit, then click here.
   redaction:
     edit:
       description: "Description"