skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Merge branch 'master' of github.com:Lyndir/MasterPassword

Browse Source
This commit is contained in:
Maarten Billemont 2016-10-27 14:20:14 -04:00
commit c1f4d2db24
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MasterPassword/C/mpw.bashrc
View File

@ -5,7 +5,7 @@ mpw() {
if hash pbcopy 2>/dev/null; then if hash pbcopy 2>/dev/null; then
pbcopy pbcopy
elif hash xclip 2>/dev/null; then elif hash xclip 2>/dev/null; then
xclip xclip -selection clip
else else
cat; echo 2>/dev/null cat; echo 2>/dev/null
return return

2
MasterPassword/C/mpw_tests.xml
View File

@ -1 +1 @@
../Java/masterpassword-algorithm/src/test/resources/mpw_tests.xml ../Java/masterpassword-tests/src/main/resources/mpw_tests.xml

12
MasterPassword/Web/js/main.js
View File

@ -31,8 +31,10 @@ function update(working) {
if (!working) if (!working)
$('#userName').focus(); $('#userName').focus();
} }
else else {
$('#identity').removeClass('active'); $('#identity').removeClass('active');
$('#userName')[0].value = $('#masterPassword')[0].value = '';
}
if (screen == 'site') { if (screen == 'site') {
$('#site').addClass('active'); $('#site').addClass('active');
@ -40,16 +42,16 @@ function update(working) {
if (!working) if (!working)
$('#siteName').focus(); $('#siteName').focus();
} }
else else {
$('#site').removeClass('active'); $('#site').removeClass('active');
$('#siteName')[0].value = $('#sitePassword')[0].value = '';
}
// Working // Working
if (working && screen == 'identity') if (working && screen == 'identity')
$('#identity').addClass('working').find('input, select').attr('disabled', 'disabled'); $('#identity').addClass('working').find('input, select').attr('disabled', 'disabled');
else { else
$('#userName')[0].value = $('#masterPassword')[0].value = '';
$('#identity').removeClass('working').find('input, select').removeAttr('disabled'); $('#identity').removeClass('working').find('input, select').removeAttr('disabled');
}
if (working && screen == 'site') if (working && screen == 'site')
$('#site').addClass('working'); $('#site').addClass('working');