diff options
| author | Struan Donald <struan@exo.org.uk> | 2013-08-09 15:36:25 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2013-08-09 15:36:25 +0100 |
| commit | fac2ebd18720509a41fea47036300056665625ab (patch) | |
| tree | dfd59b259ea31d7c7e307c9eeb60b42881f91287 | |
| parent | 0bd61cc264657a9881addb0539514670d850b635 (diff) | |
make photo upload timeout configurable
| -rw-r--r-- | src/js/app.js | 1 | ||||
| -rw-r--r-- | src/js/config.js-example | 5 | ||||
| -rw-r--r-- | src/js/models/report.js | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/js/app.js b/src/js/app.js index 4709ea6..232031a 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -49,6 +49,7 @@ var tpl = { currentPosition: null, isAndroid: false, iPhoneModel: 0, + uploadTimeout: CONFIG.UPLOAD_TIMEOUT || 120000, currentDraft: new FMS.Draft(), allDrafts: new FMS.Drafts(), diff --git a/src/js/config.js-example b/src/js/config.js-example index fd361d1..f5648a9 100644 --- a/src/js/config.js-example +++ b/src/js/config.js-example @@ -15,5 +15,8 @@ var CONFIG = { FILES_DIR: 'photos', // accuracy in meters required before geolocation is successful - ACCURACY: 100 + ACCURACY: 100, + + // how long, in milliseconds, before photo uploads timeout. Defaults to 120000 ( 2 minutes ) + UPLOAD_TIMEOUT: 120000 }; diff --git a/src/js/models/report.js b/src/js/models/report.js index bc724ea..008b9eb 100644 --- a/src/js/models/report.js +++ b/src/js/models/report.js @@ -148,7 +148,7 @@ var uploadTime = Date.now() - startTime; if ( ( lastUploadPcnt == 0 && uploadPcnt == 0 ) || ( lastUploadPcnt > 0 && uploadPcnt == lastUploadPcnt ) || - uploadTime > 120000 + uploadTime > FMS.uploadTimeout ) { ft.abort(); } else { |