Browse Source

Dismiss login failed message when any key is pressed. Fixes #114

sisyphus
Dustin Falgout 8 years ago
parent
commit
7c60cb46e1
No known key found for this signature in database
GPG Key ID: AEA529BF122902E5
  1. 24
      themes/default/js/greeter.js

24
themes/default/js/greeter.js vendored

@ -376,6 +376,7 @@ class Theme {
this.tux = 'img/antergos-logo-user.png'; this.tux = 'img/antergos-logo-user.png';
this.user_list_visible = false; this.user_list_visible = false;
this.auth_pending = false; this.auth_pending = false;
this.showing_message = false;
this.selected_user = null; this.selected_user = null;
this.$user_list = $( '#user-list2' ); this.$user_list = $( '#user-list2' );
this.$session_list = $( '#sessions' ); this.$session_list = $( '#sessions' );
@ -718,6 +719,7 @@ class Theme {
} else { } else {
// The user did not enter the correct password. Show error message. // The user did not enter the correct password. Show error message.
this.showing_message = true;
this.show_message( err_msg, 'error' ); this.show_message( err_msg, 'error' );
} }
} }
@ -748,22 +750,25 @@ class Theme {
key_press_handler( event ) { key_press_handler( event ) {
let action; let action = this.showing_message ? this.dismiss_message : null;
if ( null === action ) {
switch ( event.which ) { switch ( event.which ) {
case 13: case 13:
action = this.auth_pending ? this.submit_password : ! this.user_list_visible ? this.show_user_list : null; if ( this.auth_pending ) {
action = this.submit_password;
} else if ( ! this.user_list_visible ) {
action = this.show_user_list;
}
break; break;
case 27: case 27:
action = this.auth_pending ? this.cancel_authentication : null; action = this.auth_pending ? this.cancel_authentication : null;
break; break;
case 32: case 32:
action = ( ! this.user_list_visible && ! this.auth_pending ) ? this.show_user_list : null; action = ( !this.user_list_visible && !this.auth_pending ) ? this.show_user_list : null;
break;
default:
action = null;
break; break;
} }
}
if ( null !== action ) { if ( null !== action ) {
action(); action();
@ -853,6 +858,13 @@ class Theme {
$( '#collapseTwo .user-wrap2' ).hide(); $( '#collapseTwo .user-wrap2' ).hide();
this.$msg_area_container.show(); this.$msg_area_container.show();
} }
dismiss_message() {
this.$msg_area_container
.children( '.alert-dismissible' )
.find('.close')
.trigger('click');
}
} }

Loading…
Cancel
Save