Skip to content

Conversation

@backportbot-nextcloud
Copy link

backport of #4535

PVince81 and others added 5 commits February 9, 2021 16:38
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
The upload editor is shown based on both "showUploadEditor" (set in the
store) and "modalDismissed" (set in the component). As "modalDismissed"
is initially false and "showUploadEditor" was not cleared after an
upload started or was discarded this caused the upload editor to be
immediately shown if mounted again (for example, when joining a
conversation in the Files app sidebar) if a previous upload was
initialised.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
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]>
As "showUploadEditor" is true only when "currentUploadId" is set and
false otherwise there is no need to use a separate variable.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@backportbot-nextcloud backportbot-nextcloud bot added bug feature: talk-sidebar ⬅️ Sidebar integration of Talk into other apps like sharing and documents regression labels Feb 9, 2021
@backportbot-nextcloud backportbot-nextcloud bot added this to the 💚 Next Alpha (21) milestone Feb 9, 2021
@PVince81 PVince81 self-assigned this Feb 9, 2021
Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 tested, works

@PVince81 PVince81 merged commit 3206ff4 into stable21 Feb 9, 2021
@PVince81 PVince81 deleted the backport/4535/stable21 branch February 9, 2021 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to release bug feature: talk-sidebar ⬅️ Sidebar integration of Talk into other apps like sharing and documents regression

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants