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

ensure timeout error is shown on u2f timeout #14417

Merged
merged 4 commits into from
Jan 22, 2021
Merged

ensure timeout error is shown on u2f timeout #14417

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1113c28
ensure timeout error is shown on u2f timeout
zeripath Jan 21, 2021
d6c0e09
Merge branch 'master' into u2f-timeout-show-error
zeripath Jan 21, 2021
79eae67
Merge branch 'master' into u2f-timeout-show-error
6543 Jan 21, 2021
ae7fa88
Merge branch 'master' into u2f-timeout-show-error
6543 Jan 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/user/auth/u2f_error.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div class="hide" id="u2f-error-4">
{{.i18n.Tr "u2f_error_4"}}
</div>
<div class="hide u2f-error-5">
<div class="hide u2f_error_5">
{{.i18n.Tr "u2f_error_5"}}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2243,7 +2243,7 @@ function u2fError(errorType) {
2: $('#u2f-error-2'),
3: $('#u2f-error-3'),
4: $('#u2f-error-4'),
5: $('.u2f-error-5')
5: $('.u2f_error_5')
Copy link
Member

Choose a reason for hiding this comment

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

is this inconsistency really right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes look at line 29 in u2f_error.tmpl

Copy link
Member

@techknowlogick techknowlogick Jan 21, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

wouldn't it be better to change L29 of the template to u2f-error-5 instead to retain consistency?

};
u2fErrors[errorType].removeClass('hide');

Expand Down