From 51a22431ee824357dce0100cb000032f29aabd47 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Wed, 10 Dec 2014 16:59:03 +0100 Subject: load showpassord.js conditionally in the template only if needed --- core/js/installation.js | 5 +++++ core/js/js.js | 29 ----------------------------- 2 files changed, 5 insertions(+), 29 deletions(-) create mode 100644 core/js/installation.js (limited to 'core/js') diff --git a/core/js/installation.js b/core/js/installation.js new file mode 100644 index 00000000000..20ff346215f --- /dev/null +++ b/core/js/installation.js @@ -0,0 +1,5 @@ + +$(document).ready(function() { + $('#adminpass').showPassword().keyup(); + $('#dbpass').showPassword().keyup(); +}); diff --git a/core/js/js.js b/core/js/js.js index f01c0eb77c1..57ce1ab6955 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1081,35 +1081,6 @@ function initCore() { } }); - var setShowPassword = function(input, label) { - input.showPassword().keyup(); - }; - setShowPassword($('#adminpass'), $('label[for=show]')); - setShowPassword($('#pass2'), $('label[for=personal-show]')); - setShowPassword($('#dbpass'), $('label[for=dbpassword]')); - - var checkShowCredentials = function() { - var empty = false; - $('input#user, input#password').each(function() { - if ($(this).val() === '') { - empty = true; - } - }); - if(empty) { - $('#submit').fadeOut(); - $('#remember_login').hide(); - $('#remember_login+label').fadeOut(); - } else { - $('#submit').fadeIn(); - $('#remember_login').show(); - $('#remember_login+label').fadeIn(); - } - }; - // hide log in button etc. when form fields not filled - // commented out due to some browsers having issues with it - // checkShowCredentials(); - // $('input#user, input#password').keyup(checkShowCredentials); - // user menu $('#settings #expand').keydown(function(event) { if (event.which === 13 || event.which === 32) { -- cgit v1.2.3