Skip to content
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.

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

fix: Make edit mode in interactive widgets opt-in #5579

Merged
merged 3 commits into from
Apr 3, 2024
Merged

Conversation

juliusknorr
Copy link
Member

@juliusknorr juliusknorr commented Mar 28, 2024

  • fix: Make edit mode in interactive widgets opt-in
  • fix: Show skeleton loading until file is actually ready

Fix #5532
Fix #5542

🖼️ Screenshots

View only mode
Screenshot 2024-03-28 at 14 14 32
Edit mode
Screenshot 2024-03-28 at 14 16 49

@juliusknorr juliusknorr added bug Something isn't working 3. to review labels Mar 28, 2024
@juliusknorr juliusknorr added this to the Nextcloud 29 milestone Mar 28, 2024
@juliusknorr
Copy link
Member Author

/backport to stable29

Copy link
Member

@jancborchardt jancborchardt left a comment

Choose a reason for hiding this comment

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

Looks very nice!

Maybe small adjustment so it's not vertically jumping between view and edit mode when the toolbar pops in:
In view-mode, in the space where the toolbar is, it could show the document name (in bold, left-aligned). Is that possible @juliushaertl?

Not a blocker though.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
… vue instance

Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr
Copy link
Member Author

In view-mode, in the space where the toolbar is, it could show the document name (in bold, left-aligned). Is that possible?

Yes, though I'd file as a follow up to get this in rather quickly

Copy link
Member

@jancborchardt jancborchardt left a comment

Choose a reason for hiding this comment

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

In that case all good design-wise. :)

@juliusknorr juliusknorr merged commit 28d37f7 into main Apr 3, 2024
59 checks passed
@juliusknorr juliusknorr deleted the fix/5532 branch April 3, 2024 10:22
Copy link

backportbot bot commented Apr 3, 2024

The backport to stable29 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable29
git pull origin stable29

# Create the new backport branch
git checkout -b backport/5579/stable29

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 804241d0 6001f7b9 4badefff

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/5579/stable29

Error: Failed to create pull request: Validation Failed: {"resource":"PullRequest","code":"custom","message":"A pull request already exists for nextcloud:backport/5579/stable29."}


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Copy link
Member

@mejo- mejo- left a comment

Choose a reason for hiding this comment

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

Changes look sensible ☺️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review bug Something isn't working
Projects
None yet
3 participants