Commit c173c2b41b860fbb9c38b6c51a466f9652d0461f
tweak progress display
Matt McKegg committed on 5/13/2018, 11:50:29 AMParent: a64c5f3b893f894105903efc339ec3209633ef1d
Files changed
| modules/app/html/progress-notifier.js | changed |
| modules/app/html/progress-notifier.js | |||
|---|---|---|---|
| @@ -44,10 +44,10 @@ | |||
| 44 | 44 … | return 1 | |
| 45 | 45 … | } | |
| 46 | 46 … | }) | |
| 47 | 47 … | ||
| 48 | - var hidden = sustained(computed([waiting, replicateProgress.incompleteFeeds, pending, pendingMigration], (waiting, incomplete, pending, pendingMigration) => { | ||
| 49 | - return !waiting && incomplete < 5 && !pending && !pendingMigration | ||
| 48 … | + var hidden = sustained(computed([waiting, downloadProgress, pending, pendingMigration], (waiting, downloadProgress, pending, pendingMigration) => { | ||
| 49 … | + return !waiting && downloadProgress === 1 && !pending && !pendingMigration | ||
| 50 | 50 … | }), 500) | |
| 51 | 51 … | ||
| 52 | 52 … | // HACK: css animations take up WAY TO MUCH cpu, remove from dom when inactive | |
| 53 | 53 … | var displaying = computed(sustained(hidden, 500, x => !x), hidden => !hidden) | |
| @@ -56,9 +56,9 @@ | |||
| 56 | 56 … | h('div.status', [ | |
| 57 | 57 … | when(displaying, h('Loading -small', [ | |
| 58 | 58 … | when(pendingMigration, | |
| 59 | 59 … | [h('span.info', i18n('Upgrading database')), h('progress', { style: {'margin-left': '10px'}, min: 0, max: 1, value: migrationProgress })], | |
| 60 | - when(computed(replicateProgress.incompleteFeeds, (v) => v > 5), | ||
| 60 … | + when(computed(downloadProgress, (v) => v < 1), | ||
| 61 | 61 … | [h('span.info', i18n('Downloading new messages')), h('progress', { style: {'margin-left': '10px'}, min: 0, max: 1, value: downloadProgress })], | |
| 62 | 62 … | when(pending, [ | |
| 63 | 63 … | [h('span.info', i18n('Indexing database')), h('progress', { style: {'margin-left': '10px'}, min: 0, max: 1, value: indexProgress })] | |
| 64 | 64 … | ], i18n('Scuttling...')) | |
Built with git-ssb-web