mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-29 10:57:44 +09:00 
			
		
		
		
	Don't do a full page load when clicking the subscribe button (#28871)
- Refactor the form around the subscribe button into its own template - Use htmx to perform the form submission - `hx-boost="true"` to prevent the default form submission behavior of a full page load - `hx-sync="this:replace"` to replace the current request (in case the button is clicked again before the response is returned) - `hx-target="this"` to replace the form tag with the new form tag - `hx-push-url="false"` to disable a change to the URL - `hx-swap="show:no-scroll"` to preserve the scroll position - Change the backend response to return a `<form>` tag instead of a redirect to the issue page - Include `htmx.org` in javascript imports This change introduces htmx with the hope we could use it to make Gitea more reactive while keeping our "HTML rendered on the server" approach. # Before  # After  --------- Signed-off-by: Yarden Shoham <git@yardenshoham.com>
This commit is contained in:
		
							
								
								
									
										6
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										6
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							| @@ -26,6 +26,7 @@ | ||||
|         "esbuild-loader": "4.0.2", | ||||
|         "escape-goat": "4.0.0", | ||||
|         "fast-glob": "3.3.2", | ||||
|         "htmx.org": "1.9.10", | ||||
|         "jquery": "3.7.1", | ||||
|         "katex": "0.16.9", | ||||
|         "license-checker-webpack-plugin": "0.2.1", | ||||
| @@ -6158,6 +6159,11 @@ | ||||
|         "url": "https://github.com/fb55/entities?sponsor=1" | ||||
|       } | ||||
|     }, | ||||
|     "node_modules/htmx.org": { | ||||
|       "version": "1.9.10", | ||||
|       "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-1.9.10.tgz", | ||||
|       "integrity": "sha512-UgchasltTCrTuU2DQLom3ohHrBvwr7OqpwyAVJ9VxtNBng4XKkVsqrv0Qr3srqvM9ZNI3f1MmvVQQqK7KW/bTA==" | ||||
|     }, | ||||
|     "node_modules/http-proxy-agent": { | ||||
|       "version": "7.0.0", | ||||
|       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz", | ||||
|   | ||||
| @@ -25,6 +25,7 @@ | ||||
|     "esbuild-loader": "4.0.2", | ||||
|     "escape-goat": "4.0.0", | ||||
|     "fast-glob": "3.3.2", | ||||
|     "htmx.org": "1.9.10", | ||||
|     "jquery": "3.7.1", | ||||
|     "katex": "0.16.9", | ||||
|     "license-checker-webpack-plugin": "0.2.1", | ||||
|   | ||||
| @@ -8,10 +8,15 @@ import ( | ||||
| 	"strconv" | ||||
|  | ||||
| 	issues_model "code.gitea.io/gitea/models/issues" | ||||
| 	"code.gitea.io/gitea/modules/base" | ||||
| 	"code.gitea.io/gitea/modules/context" | ||||
| 	"code.gitea.io/gitea/modules/log" | ||||
| ) | ||||
|  | ||||
| const ( | ||||
| 	tplWatching base.TplName = "repo/issue/view_content/watching" | ||||
| ) | ||||
|  | ||||
| // IssueWatch sets issue watching | ||||
| func IssueWatch(ctx *context.Context) { | ||||
| 	issue := GetActionIssue(ctx) | ||||
| @@ -52,5 +57,7 @@ func IssueWatch(ctx *context.Context) { | ||||
| 		return | ||||
| 	} | ||||
|  | ||||
| 	ctx.Redirect(issue.Link()) | ||||
| 	ctx.Data["Issue"] = issue | ||||
| 	ctx.Data["IssueWatch"] = &issues_model.IssueWatch{IsWatching: watch} | ||||
| 	ctx.HTML(http.StatusOK, tplWatching) | ||||
| } | ||||
|   | ||||
| @@ -270,19 +270,7 @@ | ||||
| 		<div class="ui watching"> | ||||
| 			<span class="text"><strong>{{ctx.Locale.Tr "notification.notifications"}}</strong></span> | ||||
| 			<div class="gt-mt-3"> | ||||
| 				<form method="post" action="{{.Issue.Link}}/watch"> | ||||
| 					<input type="hidden" name="watch" value="{{if $.IssueWatch.IsWatching}}0{{else}}1{{end}}"> | ||||
| 					{{$.CsrfTokenHtml}} | ||||
| 					<button class="fluid ui button"> | ||||
| 						{{if $.IssueWatch.IsWatching}} | ||||
| 							{{svg "octicon-mute" 16 "gt-mr-3"}} | ||||
| 							{{ctx.Locale.Tr "repo.issues.unsubscribe"}} | ||||
| 						{{else}} | ||||
| 							{{svg "octicon-unmute" 16 "gt-mr-3"}} | ||||
| 							{{ctx.Locale.Tr "repo.issues.subscribe"}} | ||||
| 						{{end}} | ||||
| 					</button> | ||||
| 				</form> | ||||
| 				{{template "repo/issue/view_content/watching" .}} | ||||
| 			</div> | ||||
| 		</div> | ||||
| 	{{end}} | ||||
|   | ||||
							
								
								
									
										13
									
								
								templates/repo/issue/view_content/watching.tmpl
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								templates/repo/issue/view_content/watching.tmpl
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,13 @@ | ||||
| <form hx-boost="true" hx-sync="this:replace" hx-target="this" hx-push-url="false" hx-swap="show:no-scroll" method="post" action="{{.Issue.Link}}/watch"> | ||||
| 	<input type="hidden" name="watch" value="{{if $.IssueWatch.IsWatching}}0{{else}}1{{end}}"> | ||||
| 	{{$.CsrfTokenHtml}} | ||||
| 	<button class="fluid ui button"> | ||||
| 		{{if $.IssueWatch.IsWatching}} | ||||
| 			{{svg "octicon-mute" 16 "gt-mr-3"}} | ||||
| 			{{ctx.Locale.Tr "repo.issues.unsubscribe"}} | ||||
| 		{{else}} | ||||
| 			{{svg "octicon-unmute" 16 "gt-mr-3"}} | ||||
| 			{{ctx.Locale.Tr "repo.issues.subscribe"}} | ||||
| 		{{end}} | ||||
| 	</button> | ||||
| </form> | ||||
| @@ -12,6 +12,7 @@ import {showTemporaryTooltip} from '../modules/tippy.js'; | ||||
| import {confirmModal} from './comp/ConfirmModal.js'; | ||||
| import {showErrorToast} from '../modules/toast.js'; | ||||
| import {request, POST} from '../modules/fetch.js'; | ||||
| import 'htmx.org'; | ||||
|  | ||||
| const {appUrl, appSubUrl, csrfToken, i18n} = window.config; | ||||
|  | ||||
|   | ||||
| @@ -214,6 +214,7 @@ export default { | ||||
|       }, | ||||
|       override: { | ||||
|         'khroma@*': {licenseName: 'MIT'}, // https://github.com/fabiospampinato/khroma/pull/33 | ||||
|         'htmx.org@1.9.10': {licenseName: 'BSD-2-Clause'}, // "BSD 2-Clause" -> "BSD-2-Clause" | ||||
|       }, | ||||
|       emitError: true, | ||||
|       allow: '(Apache-2.0 OR BSD-2-Clause OR BSD-3-Clause OR MIT OR ISC OR CPAL-1.0 OR Unlicense OR EPL-1.0 OR EPL-2.0)', | ||||
|   | ||||
		Reference in New Issue
	
	Block a user