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

Merge branch 'dev/tabCycleLogin' into devel

Browse source
This commit is contained in:
Gina Häußge 2015-09-07 09:35:35 +02:00
commit b326b6bd33
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
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();
}
};
@ -121,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();
};