Merge branch 'master' of github.com:Lyndir/MasterPassword
This commit is contained in:
commit
c1f4d2db24
@ -5,7 +5,7 @@ mpw() {
|
||||
if hash pbcopy 2>/dev/null; then
|
||||
pbcopy
|
||||
elif hash xclip 2>/dev/null; then
|
||||
xclip
|
||||
xclip -selection clip
|
||||
else
|
||||
cat; echo 2>/dev/null
|
||||
return
|
||||
|
@ -1 +1 @@
|
||||
../Java/masterpassword-algorithm/src/test/resources/mpw_tests.xml
|
||||
../Java/masterpassword-tests/src/main/resources/mpw_tests.xml
|
@ -31,8 +31,10 @@ function update(working) {
|
||||
if (!working)
|
||||
$('#userName').focus();
|
||||
}
|
||||
else
|
||||
else {
|
||||
$('#identity').removeClass('active');
|
||||
$('#userName')[0].value = $('#masterPassword')[0].value = '';
|
||||
}
|
||||
|
||||
if (screen == 'site') {
|
||||
$('#site').addClass('active');
|
||||
@ -40,16 +42,16 @@ function update(working) {
|
||||
if (!working)
|
||||
$('#siteName').focus();
|
||||
}
|
||||
else
|
||||
else {
|
||||
$('#site').removeClass('active');
|
||||
$('#siteName')[0].value = $('#sitePassword')[0].value = '';
|
||||
}
|
||||
|
||||
// Working
|
||||
if (working && screen == 'identity')
|
||||
$('#identity').addClass('working').find('input, select').attr('disabled', 'disabled');
|
||||
else {
|
||||
$('#userName')[0].value = $('#masterPassword')[0].value = '';
|
||||
else
|
||||
$('#identity').removeClass('working').find('input, select').removeAttr('disabled');
|
||||
}
|
||||
|
||||
if (working && screen == 'site')
|
||||
$('#site').addClass('working');
|
||||
|
Loading…
Reference in New Issue
Block a user