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.

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

Jump to bottom

Improve AJAX link and modal confirm dialog #25210

Merged
merged 8 commits into from
Jun 13, 2023
Merged

Improve AJAX link and modal confirm dialog #25210

merged 8 commits into from
Jun 13, 2023

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Jun 12, 2023 •
edited
Loading

Clarify the "link-action" behavior:

// A "link-action" can post AJAX request to its "data-url"
// Then the browser is redirect to: the "redirect" in response, or "data-redirect" attribute, or current URL by reloading.

And enhance the "link-action" to support showing a modal dialog for confirm. A similar general approach could also help PRs like #22344 (comment)

// If the "link-action" has "data-modal-confirm(-html)" attribute, a confirm modal dialog will be shown before taking action.

And a lot of duplicate code can be removed now. A good framework design can help to avoid code copying&pasting.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 12, 2023
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 12, 2023
@wxiaoguang wxiaoguang added the topic/ui Change the appearance of the Gitea UI label Jun 12, 2023
@wxiaoguang wxiaoguang added this to the 1.21.0 milestone Jun 12, 2023
@wxiaoguang wxiaoguang force-pushed the fix-modal branch 2 times, most recently from 0a30446 to 61e7ec3 Compare June 12, 2023 16:11
wxiaoguang and others added 3 commits June 13, 2023 01:10
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jun 12, 2023
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jun 13, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 13, 2023
@lunny lunny enabled auto-merge (squash) June 13, 2023 09:33
@lunny lunny merged commit 6bbccdd into go-gitea:main Jun 13, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 13, 2023
@wxiaoguang wxiaoguang deleted the fix-modal branch June 13, 2023 12:12
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 15, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
de2c98c 
* upstream/main: (31 commits)
  Show OAuth2 errors to end users (go-gitea#25261)
  [skip ci] Updated translations via Crowdin
  Fix index generation parallelly failure (go-gitea#25235)
  Fix variable in template (go-gitea#25267)
  Add template linting via djlint (go-gitea#25212)
  Fix edit OAuth application width (go-gitea#25262)
  Use flex to align SVG and text (go-gitea#25163)
  GitHub Actions enhancements for frontend (go-gitea#25150)
  Add missing `v` in migrations.go (go-gitea#25252)
  Change form actions to fetch for submit review box (go-gitea#25219)
  Fix panic when migrating a repo from GitHub with issues (go-gitea#25246)
  Fix description of drop custom_labels migration (go-gitea#25243)
  Fix all possible setting error related storages and added some tests (go-gitea#23911)
  [skip ci] Updated translations via Crowdin
  Revert overflow: overlay (revert go-gitea#21850) (go-gitea#25231)
  Support changing labels of Actions runner without re-registration (go-gitea#24806)
  Improve AJAX link and modal confirm dialog (go-gitea#25210)
  Use inline SVG for built-in OAuth providers (go-gitea#25171)
  Disable `Create column` button while the column name is empty  (go-gitea#25192)
  Fix profile render when the README.md size is larger than 1024 bytes (go-gitea#25131)
  ...
@wxiaoguang wxiaoguang mentioned this pull request Jun 16, 2023
Merged
@wxiaoguang
Copy link
Contributor Author

-> Fix incorrect link-action event target #25306

silverwind pushed a commit that referenced this pull request Jun 18, 2023
@wxiaoguang @GiteaBot
Fix incorrect link-action event target (#25306)
695f5d1 
A regression of #25210

The `e.target` is not "this", eg: `<button link-action><svg></button>`,
then `this` should be `button` but `e.target` is `svg`.

I will propose a clearer and complete solution for these "link-action"
"show-modal" elements after #24724

Co-authored-by: Giteabot <teabot@gitea.io>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 11, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind approved these changes

@a1012112796 a1012112796 a1012112796 approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. topic/ui Change the appearance of the Gitea UI
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.
5 participants
@wxiaoguang @silverwind @a1012112796 @lunny @GiteaBot