Skip to content

[stable21] Add upload editor in files sidebar mode #5112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 5 commits into from
Feb 9, 2021
Merged

[stable21] Add upload editor in files sidebar mode #5112

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0717fb1
Add upload editor in files sidebar mode
PVince81 Nov 4, 2020
9ca8923
Add store action to discard an upload
danxuliu Nov 6, 2020
c15dd85
Clear state when starting or discarding uploads
danxuliu Nov 6, 2020
f7c4908
Remove no longer needed "modalDismissed"
danxuliu Nov 6, 2020
4f53791
Remove no longer needed "showUploadEditor"
danxuliu Nov 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove no longer needed "modalDismissed" 
As "showUploadEditor" is now properly updated in the store when an
upload starts or discarded the "modalDismissed" property of the
component is redundant and can be removed.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu @backportbot
danxuliu authored and backportbot[bot] committed Feb 9, 2021
commit f7c4908105f92059a0a63a55d872d73bf3c950ec
18 changes: 1 addition & 17 deletions src/components/UploadEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,6 @@ export default {
Plus,
},

data() {
return {
modalDismissed: false,
}
},

computed: {
token() {
return this.$store.getters.getToken()
Expand All @@ -102,12 +96,8 @@ export default {
return []
},

showUploadEditor() {
return this.$store.getters.showUploadEditor
},

showModal() {
return this.showUploadEditor && !this.modalDismissed
return this.$store.getters.showUploadEditor
},

addMoreAriaLabel() {
Expand All @@ -121,10 +111,6 @@ export default {
this.focus()
}
},

currentUploadId() {
this.modalDismissed = false
},
},

methods: {
Expand All @@ -136,12 +122,10 @@ export default {

handleDismiss() {
this.$store.dispatch('discardUpload', this.currentUploadId)
this.modalDismissed = true
},

handleUpload() {
this.$store.dispatch('uploadFiles', this.currentUploadId)
this.modalDismissed = true
},
/**
* Clicks the hidden file input when clicking the correspondent ActionButton,
Expand Down