Skip to content

Commit

Permalink
Add indeterminate progress bar in upload overlay
Browse files Browse the repository at this point in the history
  • Loading branch information
JammingBen committed Jun 14, 2022
1 parent d49cb80 commit e465e40
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Enhancement: Indeterminate progress bar in upload overlay

We've added an indeterminate state to the progress bar in the upload overlay as long as the upload is preparing.

https://github.com/owncloud/web/pull/7123
https://github.com/owncloud/web/issues/7105

2 changes: 1 addition & 1 deletion packages/web-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"luxon": "^2.4.0",
"marked": "^4.0.12",
"oidc-client": "1.11.5",
"owncloud-design-system": "^13.1.0",
"owncloud-design-system": "^13.2.0-rc.1",
"owncloud-sdk": "~3.0.0-alpha.13",
"p-queue": "^6.6.2",
"popper-max-size-modifier": "^0.2.0",
Expand Down
7 changes: 6 additions & 1 deletion packages/web-runtime/src/components/UploadInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,12 @@
</div>
</div>
<div v-if="runningUploads" class="upload-info-progress oc-mx-m oc-mb-m oc-mt-s">
<oc-progress :value="totalProgress" :max="100" size="small" />
<oc-progress
:value="totalProgress"
:max="100"
size="small"
:indeterminate="!filesInProgressCount"
/>
</div>
<div v-if="infoExpanded" class="upload-info-items oc-px-m oc-pb-m">
<ul class="oc-list">
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9707,9 +9707,9 @@ __metadata:
languageName: node
linkType: hard

"owncloud-design-system@npm:^13.1.0":
version: 13.1.0
resolution: "owncloud-design-system@npm:13.1.0"
"owncloud-design-system@npm:^13.2.0-rc.1":
version: 13.2.0-rc.1
resolution: "owncloud-design-system@npm:13.2.0-rc.1"
peerDependencies:
"@popperjs/core": ^2.4.0
"@vue/composition-api": ^1.4.3
Expand All @@ -9726,7 +9726,7 @@ __metadata:
vue-inline-svg: ^2.0.0
vue-select: ^3.12.0
webfontloader: ^1.6.28
checksum: 861941fec6d8da858ebc9433de5e9d4be3c3bffb818a3e66e7983ad49841e7651217ee46a272c9bb1a5c49e6dc5b4d75b1ec394e7ba29936b886839c702fc1ff
checksum: 56d47b1a9b276dfb289fc0fb523bfa96ce223f595afe9230d8675da84b7393ede45768ae185339a268644e4ecacb9d610617662ff8ddf5b7b0f16ebd36a76916
languageName: node
linkType: hard

Expand Down Expand Up @@ -13781,7 +13781,7 @@ __metadata:
luxon: ^2.4.0
marked: ^4.0.12
oidc-client: 1.11.5
owncloud-design-system: ^13.1.0
owncloud-design-system: ^13.2.0-rc.1
owncloud-sdk: ~3.0.0-alpha.13
p-queue: ^6.6.2
popper-max-size-modifier: ^0.2.0
Expand Down

0 comments on commit e465e40

Please sign in to comment.