Skip to content

Commit 2dc6f15

Browse files
Treoralunny
authored andcommittedMar 23, 2018
Don't warn users about *every* dirty form (go-gitea#3707)
The choice regarding which forms should or should not trigger a warning is subjective. I tried to be consistent and not warn about forms that: - run an action, rather than edit data: search, send an email. - delete data: a warning about losing data would be confusing Note that forms on sign-in pages were already ignored (using a selector, rather than an explicit class on the form element). Fixes go-gitea#3698.
1 parent e64aa18 commit 2dc6f15

15 files changed

+19
-16
lines changed
 

‎public/js/index.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -1663,8 +1663,11 @@ function selectRange($list, $select, $from) {
16631663
}
16641664

16651665
$(function () {
1666-
if ($('.user.signin').length > 0) return;
1667-
$('form').areYouSure();
1666+
// Warn users that try to leave a page after entering data into a form.
1667+
// Except on sign-in pages, and for forms marked as 'ignore-dirty'.
1668+
if ($('.user.signin').length === 0) {
1669+
$('form:not(.ignore-dirty)').areYouSure();
1670+
}
16681671

16691672
// Parse SSH Key
16701673
$("#ssh-key-content").on('change paste keyup',function(){

‎templates/admin/base/search.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</div>
1818
</div>
1919
</div>
20-
<form class="ui form" style="max-width: 90%">
20+
<form class="ui form ignore-dirty" style="max-width: 90%">
2121
<div class="ui fluid action input">
2222
<input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
2323
<button class="ui blue button">{{.i18n.Tr "explore.search"}}</button>

‎templates/admin/config.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
{{end}}
186186
<dt>{{.i18n.Tr "admin.config.mailer_user"}}</dt>
187187
<dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd><br>
188-
<form class="ui form" action="{{AppSubUrl}}/admin/config/test_mail" method="post">
188+
<form class="ui form ignore-dirty" action="{{AppSubUrl}}/admin/config/test_mail" method="post">
189189
{{.CsrfTokenHtml}}
190190
<div class="inline field ui left">
191191
<div class="ui input">

‎templates/explore/code.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="explore users">
33
{{template "explore/navbar" .}}
44
<div class="ui container">
5-
<form class="ui form" style="max-width: 100%">
5+
<form class="ui form ignore-dirty" style="max-width: 100%">
66
<div class="ui fluid action input">
77
<input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
88
<input type="hidden" name="tab" value="{{$.TabName}}">

‎templates/explore/search.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</div>
1616
</div>
1717
</div>
18-
<form class="ui form" style="max-width: 90%">
18+
<form class="ui form ignore-dirty" style="max-width: 90%">
1919
<div class="ui fluid action input">
2020
<input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
2121
<input type="hidden" name="tab" value="{{$.TabName}}">

‎templates/org/settings/delete.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<div class="ui red message">
1414
<p class="text left"><i class="octicon octicon-alert"></i> {{.i18n.Tr "org.settings.delete_prompt" | Str2html}}</p>
1515
</div>
16-
<form class="ui form" id="delete-form" action="{{.Link}}" method="post">
16+
<form class="ui form ignore-dirty" id="delete-form" action="{{.Link}}" method="post">
1717
{{.CsrfTokenHtml}}
1818
<input class="fake" type="password">
1919
<div class="inline required field {{if .Err_Password}}error{{end}}">

‎templates/repo/commits_table.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</div>
66
<div class="ten wide right aligned column">
77
{{if .PageIsCommits}}
8-
<form action="{{.RepoLink}}/commits/{{.BranchNameSubURL}}/search">
8+
<form class="ignore-dirty" action="{{.RepoLink}}/commits/{{.BranchNameSubURL}}/search">
99
<div class="ui tiny search input">
1010
<input name="q" placeholder="{{.i18n.Tr "repo.commits.search"}}" value="{{.Keyword}}" autofocus>
1111
</div>

‎templates/repo/home.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</div>
1111
{{if .RepoSearchEnabled}}
1212
<div class="ui repo-search">
13-
<form class="ui form" action="{{.RepoLink}}/search" method="get">
13+
<form class="ui form ignore-dirty" action="{{.RepoLink}}/search" method="get">
1414
<div class="field">
1515
<div class="ui action input">
1616
<input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "repo.search.search_repo"}}">

‎templates/repo/issue/search.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<form class="ui form">
1+
<form class="ui form ignore-dirty">
22
<div class="ui fluid action input">
33
<input type="hidden" name="type" value="{{$.ViewType}}"/>
44
<input type="hidden" name="state" value="{{$.State}}"/>

‎templates/repo/search.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{{template "repo/header" .}}
44
<div class="ui container">
55
<div class="ui repo-search">
6-
<form class="ui form" method="get">
6+
<form class="ui form ignore-dirty" method="get">
77
<div class="ui fluid action input">
88
<input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "repo.search.search_repo"}}">
99
<button class="ui button" type="submit">

‎templates/user/auth/activate.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="user activate">
33
<div class="ui middle very relaxed page grid">
44
<div class="column">
5-
<form class="ui form" action="{{AppSubUrl}}/user/activate" method="post">
5+
<form class="ui form ignore-dirty" action="{{AppSubUrl}}/user/activate" method="post">
66
{{.CsrfTokenHtml}}
77
<h2 class="ui top attached header">
88
{{.i18n.Tr "auth.active_your_account"}}

‎templates/user/auth/forgot_passwd.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="user forgot password">
33
<div class="ui middle very relaxed page grid">
44
<div class="column">
5-
<form class="ui form" action="{{.Link}}" method="post">
5+
<form class="ui form ignore-dirty" action="{{.Link}}" method="post">
66
{{.CsrfTokenHtml}}
77
<h2 class="ui top attached header">
88
{{.i18n.Tr "auth.forgot_password_title"}}

‎templates/user/auth/reset_passwd.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="user reset password">
33
<div class="ui middle very relaxed page grid">
44
<div class="column">
5-
<form class="ui form" action="{{.Link}}" method="post">
5+
<form class="ui form ignore-dirty" action="{{.Link}}" method="post">
66
{{.CsrfTokenHtml}}
77
<input name="code" type="hidden" value="{{.Code}}">
88
<h2 class="ui top attached header">

‎templates/user/settings/applications.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
{{.i18n.Tr "settings.generate_new_token"}}
3939
</h4>
4040
<div class="ui attached segment">
41-
<form class="ui form" action="{{.Link}}" method="post">
41+
<form class="ui form ignore-dirty" action="{{.Link}}" method="post">
4242
{{.CsrfTokenHtml}}
4343
<p>{{.i18n.Tr "settings.new_token_desc"}}</p>
4444
<div class="field {{if .Err_Name}}error{{end}}">

‎templates/user/settings/delete.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<div class="ui red message">
1111
<p class="text left"><i class="octicon octicon-alert"></i> {{.i18n.Tr "settings.delete_prompt" | Str2html}}</p>
1212
</div>
13-
<form class="ui form" id="delete-form" action="{{.Link}}" method="post">
13+
<form class="ui form ignore-dirty" id="delete-form" action="{{.Link}}" method="post">
1414
{{.CsrfTokenHtml}}
1515
<input class="fake" type="password">
1616
<div class="required field {{if .Err_Password}}error{{end}}">

0 commit comments

Comments
 (0)
Please sign in to comment.