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

We do that tab cycling slightly differently

Browse source 
Moving from the button to the username field probably makes even more
sense and while we are at it we can also extract the element access into
proper variables.
This commit is contained in:
Gina Häußge 2015-09-07 09:35:28 +02:00
parent c2c5d96f8f
commit 9f49e39333
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,10 @@ $(function() {
self.currentUser = ko.observable(undefined);
self.elementUsernameInput = undefined;
self.elementPasswordInput = undefined;
self.elementLoginButton = undefined;
self.userMenuText = ko.computed(function() {
if (self.loggedIn()) {
return self.username();
@ -103,7 +107,7 @@ $(function() {
self.onLoginUserKeyup = function(data, event) {
if (event.keyCode == 13) {
$("#login_pass").focus();
self.elementPasswordInput.focus();
}
};
@ -113,12 +117,6 @@ $(function() {
}
};
self.onLoginRememberKeyup = function(data, event) {
if (event.keyCode == 9) {
$("#login_user").focus();
}
}
self.onAllBound = function(allViewModels) {
self.allViewModels = allViewModels;
};
@ -127,6 +125,18 @@ $(function() {
self.requestData();
};
self.onStartup = function() {
self.elementUsernameInput = $("#login_user");
self.elementPasswordInput = $("#login_pass");
self.elementLoginButton = $("#login_button");
if (self.elementUsernameInput && self.elementUsernameInput.length
&& self.elementLoginButton && self.elementLoginButton.length) {
self.elementLoginButton.blur(function() {
self.elementUsernameInput.focus();
})
}
};
self.onStartupComplete = function() {
self.requestData();
};

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

@ -8,7 +8,7 @@
<label for="login_pass">{{ _('Password') }}</label>
<input type="password" id="login_pass" data-bind="value: loginState.loginPass, event: {'keyup': loginState.onLoginPassKeyup}" placeholder="{{ _('Password') }}">
<label class="checkbox">
<input type="checkbox" id="login_remember" data-bind="checked: loginState.loginRemember, event: {'keypress': loginState.onLoginRememberKeyup}"> {{ _('Remember me') }}
<input type="checkbox" id="login_remember" data-bind="checked: loginState.loginRemember"> {{ _('Remember me') }}
</label>
<button class="btn btn-block btn-primary" id="login_button" data-bind="click: function() { loginState.login(); }">{{ _('Login') }}</button>
</div>