cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix welcome page redirect, closed #70

Browse source
This commit is contained in:
Aaron Lidman 2013-11-18 09:56:03 -08:00
parent 2b4f8e92c9
commit b7d7781c5d
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/assets/javascripts/welcome.js
View file

@ -16,7 +16,7 @@ $(document).ready(function() {
$('.start-mapping').attr('href', url); $('.start-mapping').attr('href', url);
} else if (navigator.geolocation) { } else {
function geoSuccess(position) { function geoSuccess(position) {
window.location = '/edit' + OSM.formatHash({ window.location = '/edit' + OSM.formatHash({
zoom: 17, zoom: 17,
@ -27,21 +27,19 @@ $(document).ready(function() {
$('.start-mapping').on('click', function(e) { $('.start-mapping').on('click', function(e) {
e.preventDefault(); e.preventDefault();
$('.start-mapping').addClass('loading');
$('.start-mapping')
.addClass('loading');
// handle firefox's weird implementation // handle firefox's weird implementation
// https://bugzilla.mozilla.org/show_bug.cgi?id=675533 // https://bugzilla.mozilla.org/show_bug.cgi?id=675533
window.setTimeout(manualEdit, 4000); window.setTimeout(manualEdit, 4000);
navigator.geolocation.getCurrentPosition(geoSuccess, manualEdit); if (navigator.geolocation) {
navigator.geolocation.getCurrentPosition(geoSuccess, manualEdit);
}
}); });
} else {
manualEdit();
} }
function manualEdit() { function manualEdit() {
window.location = '/?edit_help=1' window.location = '/?edit_help=1';
} }
}); });