Skip to content

manage focus to/from/within password reset modal appropriately #1065

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

Merged
adampalay merged 3 commits into from
Sep 23, 2013
Merged

manage focus to/from/within password reset modal appropriately #1065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b3f5e6
manage focus to/from/within password reset modal appropriately
adampalay Sep 19, 2013
a0d30b2
respond to comments
adampalay Sep 20, 2013
1f5d222
remove forgot-password-modal class
adampalay Sep 20, 2013
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
27 changes: 23 additions & 4 deletions lms/templates/forgot_password_modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<%! from django.utils.translation import ugettext as _ %>

<%! from django.core.urlresolvers import reverse %>
<section id="forgot-password-modal" class="modal forgot-password-modal" role="dialog" aria-label="${_('Password Reset')}">
<section id="forgot-password-modal" class="modal" role="dialog" aria-label="${_('Password Reset')}">
<div class="inner-wrapper">
<div id="password-reset">
<header>
Expand Down Expand Up @@ -32,9 +32,7 @@ <h2>${_("Password Reset")}</h2>
</div>

<a href="#" role="button" class="close-modal" title="${_('Close Modal')}">
<div class="inner">
<p>&#10005;</p>
</div>
&#10005;
</a>
</div>
</section>
Expand All @@ -56,5 +54,26 @@ <h2>${_("Password Reset")}</h2>
$('#login-modal .close-modal').click(function(e) {
e.preventDefault();
});

var onModalClose = function() {
$("#forgot-password-modal").attr("aria-hidden", "true");
$("#forgot-password-link").focus();
};
var cycle_modal_tab = function(from_element_name, to_element_name) {
$(from_element_name).on('keydown', function(e) {
var keyCode = e.keyCode || e.which;
var TAB_KEY = 9; // 9 corresponds to the tab key
if (keyCode === TAB_KEY) {
e.preventDefault();
$(to_element_name).focus();
}
});
};
$("#forgot-password-modal .close-modal").click(onModalClose);
$("#forgot-password-modal").focus()
cycle_modal_tab("#forgot-password-modal .close-modal", "#pwd_reset_email")
cycle_modal_tab("#pwd_reset_email", "#pwd_reset_button")
cycle_modal_tab("#pwd_reset_button", "#forgot-password-modal .close-modal")

})(this)
</script>
6 changes: 5 additions & 1 deletion lms/templates/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@
$('.message.submission-error .message-copy').html(json.value);
}
});
$("#forgot-password-link").click(function() {
$("#forgot-password-modal .close-modal").focus()
})

})(this);

function toggleSubmitButton(enable) {
Expand Down Expand Up @@ -127,7 +131,7 @@ <h3 class="message-title">${_("The following errors occured while logging you in
<label for="password">${_('Password')}</label>
<input id="password" type="password" name="password" value="" required aria-required="true" />
<span class="tip tip-input">
<a href="#forgot-password-modal" rel="leanModal" class="pwd-reset action action-forgotpw" role="button" aria-haspopup="true">${_('Forgot password?')}</a>
<a href="#forgot-password-modal" rel="leanModal" class="pwd-reset action action-forgotpw" id="forgot-password-link" role="button" aria-haspopup="true">${_('Forgot password?')}</a>
</span>
</li>
</ol>
Expand Down