diff options
| author | Struan Donald <struan@exo.org.uk> | 2013-04-22 16:35:20 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2013-04-22 16:35:26 +0100 |
| commit | 5ad9377cebaadc81d39d0af1f5d9006d6ffce85d (patch) | |
| tree | fa935bdb4e2d095fec7d7b0c7b0e51a0f781952d /www/js | |
| parent | bacefc8d0568236ffdb1912882e2ff5419b2a818 (diff) | |
do not display spinner plus locating screen at the same time
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/locate.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/www/js/locate.js b/www/js/locate.js index beb40e7..c7ae17c 100644 --- a/www/js/locate.js +++ b/www/js/locate.js @@ -55,7 +55,7 @@ if ( skipLocationCheck ) { that.trigger('gps_located', { coordinates: location.coords } ); } else { - that.check_location(location.coords); + that.check_location(location.coords, false); } } }, @@ -90,10 +90,14 @@ } }, - check_location: function(coords) { + check_location: function(coords, showSpinner) { + if ( typeof( showSpinner ) === 'undefined' ) { + showSpinner = true; + } var that = this; $.ajax( { url: CONFIG.FMS_URL + 'report/new/ajax', + global: showSpinner, dataType: 'json', data: { latitude: coords.latitude, |