pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix small bug on unreliable submit event + seperate onKeyUp event

Browse source
This commit is contained in:
Paul de Vries 2016-12-05 15:34:48 +01:00
parent e52fbf061d
commit 6d158cb0d0
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/octoprint/static/js/app/viewmodels/loginstate.js
View file

@ -99,13 +99,19 @@ $(function() {
});
};
self.prepareLogin = function(data, event, extra) {
if (event.type === "submit" || (event.type === "keyup" && event.keyCode == 13)) {
self.prepareLogin = function(data, event) {
if(event && event.preventDefault) {
event.preventDefault();
self.login();
}
self.login();
};
self.onKeyUp = function(data, event) {
if (event && event.keyCode == 13) {
$('#loginForm').submit();
}
}
self.onAllBound = function(allViewModels) {
self.allViewModels = allViewModels;
};

4
src/octoprint/templates/navbar/login.jinja2
View file

@ -5,9 +5,9 @@
<div id="login_dropdown_loggedout" style="padding: 15px" class="dropdown-menu" data-bind="css: {hide: loginState.loggedIn(), 'dropdown-menu': !loginState.loggedIn()}">
<form id="loginForm" data-bind="event: {'submit': loginState.prepareLogin }" autocomplete="on">
<label for="login_user">{{ _('Username') }}</label>
<input type="text" id="login_user" name="username" data-bind="valueWithInit: loginState.loginUser, event: {'keyup': loginState.prepareLogin }" placeholder="{{ _('Username') }}" autocapitalize="none" autocomplete="on">
<input type="text" id="login_user" name="username" data-bind="valueWithInit: loginState.loginUser, event: {'keyup': loginState.onKeyUp }" placeholder="{{ _('Username') }}" autocapitalize="none" autocomplete="on">
<label for="login_pass">{{ _('Password') }}</label>
<input type="password" id="login_pass" name="password" data-bind="valueWithInit: loginState.loginPass, event: {'keyup': loginState.prepareLogin }" placeholder="{{ _('Password') }}" autocomplete="on">
<input type="password" id="login_pass" name="password" data-bind="valueWithInit: loginState.loginPass, event: {'keyup': loginState.onKeyUp }" placeholder="{{ _('Password') }}" autocomplete="on">
<label class="checkbox">
<input type="checkbox" id="login_remember" data-bind="checked: loginState.loginRemember"> {{ _('Remember me') }}
</label>