diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/models/report.js | 4 | ||||
| -rw-r--r-- | www/js/views/around.js | 6 | ||||
| -rw-r--r-- | www/js/views/existing.js | 9 | ||||
| -rw-r--r-- | www/js/views/photo.js | 21 | ||||
| -rw-r--r-- | www/js/views/submit.js | 1 |
5 files changed, 26 insertions, 15 deletions
diff --git a/www/js/models/report.js b/www/js/models/report.js index 529a6d8..2508b3f 100644 --- a/www/js/models/report.js +++ b/www/js/models/report.js @@ -72,6 +72,7 @@ if ( model.get('submit_clicked') == 'submit_sign_in' ) { params.submit_sign_in = 1; params.password_sign_in = model.get('user').get('password'); + params.remember_me = 1; } else { params.password_register = model.get('user').get('password') || ''; params.submit_register = 1; @@ -80,6 +81,7 @@ var that = this; if ( model.get('file') && model.get('file') !== '' ) { var fileUploadSuccess = function(r) { + $.mobile.loading('hide'); if ( r.response ) { var data; try { @@ -99,6 +101,7 @@ }; var fileUploadFail = function() { + $.mobile.loading('hide'); that.trigger('error', that, FMS.strings.report_send_error, options); }; @@ -112,6 +115,7 @@ fileOptions.chunkedMode = false; var ft = new FileTransfer(); + $.mobile.loading('show'); ft.upload(fileURI, CONFIG.FMS_URL + "report/new/mobile", fileUploadSuccess, fileUploadFail, fileOptions); } else { $.ajax( { diff --git a/www/js/views/around.js b/www/js/views/around.js index 419c990..834c442 100644 --- a/www/js/views/around.js +++ b/www/js/views/around.js @@ -41,13 +41,13 @@ afterDisplay: function() { if ( FMS.isOffline ) { this.navigate( 'offline' ); + } else if ( this.model && this.model.get('lat') ) { + var modelInfo = { coordinates: { latitude: this.model.get('lat'), longitude: this.model.get('lon') } }; + this.gotLocation(modelInfo); } else if ( FMS.currentPosition ) { var info = { coordinates: FMS.currentPosition }; FMS.currentPosition = null; this.gotLocation(info); - } else if ( this.model && this.model.get('lat') ) { - var modelInfo = { coordinates: { latitude: this.model.get('lat'), longitude: this.model.get('lon') } }; - this.gotLocation(modelInfo); } else { this.locate(); } diff --git a/www/js/views/existing.js b/www/js/views/existing.js index 4f761fd..21a3404 100644 --- a/www/js/views/existing.js +++ b/www/js/views/existing.js @@ -13,17 +13,20 @@ 'vclick #discard': 'discardReport' }, - useReport: function() { + useReport: function(e) { + e.preventDefault(); FMS.setCurrentDraft(this.model); this.navigate('around'); }, - saveReport: function() { + saveReport: function(e) { + e.preventDefault(); FMS.clearCurrentDraft(); this.navigate('around'); }, - discardReport: function() { + discardReport: function(e) { + e.preventDefault(); var reset = FMS.removeDraft(this.model.id, true); var that = this; reset.done( function() { that.onDraftRemove(); } ); diff --git a/www/js/views/photo.js b/www/js/views/photo.js index 041d573..74f3933 100644 --- a/www/js/views/photo.js +++ b/www/js/views/photo.js @@ -27,12 +27,14 @@ } }, - takePhoto: function() { + takePhoto: function(e) { + e.preventDefault(); var that = this; navigator.camera.getPicture( function(imgURI) { that.addPhotoSuccess(imgURI); }, function(error) { that.addPhotoFail(error); }, { saveToPhotoAlbum: true, quality: 49, destinationType: Camera.DestinationType.FILE_URI, sourceType: navigator.camera.PictureSourceType.CAMERA, correctOrientation: true }); }, - addPhoto: function() { + addPhoto: function(e) { + e.preventDefault(); var that = this; navigator.camera.getPicture( function(imgURI) { that.addPhotoSuccess(imgURI); }, function(error) { that.addPhotoFail(error); }, { saveToPhotoAlbum: false, quality: 49, destinationType: Camera.DestinationType.FILE_URI, sourceType: navigator.camera.PictureSourceType.PHOTOLIBRARY, correctOrientation: true }); }, @@ -47,9 +49,9 @@ FMS.saveCurrentDraft(); $('#photo-next-btn .ui-btn-text').text('Next'); - $('#id_del_photo_button').show(); - $('#id_photo_button').hide(); - $('#id_existing').hide(); + $('#id_del_photo_button').parents('.ui-btn').show(); + $('#id_photo_button').parents('.ui-btn').hide(); + $('#id_existing').parents('.ui-btn').hide(); }); move.fail( function() { that.addPhotoFail(); } ); @@ -63,7 +65,8 @@ } }, - deletePhoto: function() { + deletePhoto: function(e) { + e.preventDefault(); var that = this; var del = FMS.files.deleteURI( this.model.get('file') ); @@ -73,9 +76,9 @@ $('#photo').attr('src', 'images/placeholder-photo.png'); $('#photo-next-btn .ui-btn-text').text('Skip'); - $('#id_del_photo_button').hide(); - $('#id_photo_button').show(); - $('#id_existing').show(); + $('#id_del_photo_button').parents('.ui-btn').hide(); + $('#id_photo_button').parents('.ui-btn').show(); + $('#id_existing').parents('.ui-btn').show(); }); } diff --git a/www/js/views/submit.js b/www/js/views/submit.js index e408a2e..3e1ef8e 100644 --- a/www/js/views/submit.js +++ b/www/js/views/submit.js @@ -235,6 +235,7 @@ }, beforeSubmit: function() { + $('#report').focus(); if ( $('#form_name').val() ) { this.model.set('submit_clicked', 'submit_register'); this.model.set('phone', $('#form_phone').val()); |