slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web: add form: always start with four rows when opened

Browse Source 
And set the last amount's key handler more robustly.
This commit is contained in:
Simon Michael 2020-04-06 18:33:58 -07:00
parent ca4fc4a421
commit 23a79af16c
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hledger-web/static/hledger.js
View File

@ -33,7 +33,6 @@ $(document).ready(function() {
$('body').bind('keydown', 'a', function(){ addformShow(); return false; }); $('body').bind('keydown', 'a', function(){ addformShow(); return false; });
$('body').bind('keydown', 'n', function(){ addformShow(); return false; }); $('body').bind('keydown', 'n', function(){ addformShow(); return false; });
$('body').bind('keydown', 'f', function(){ $('#searchform input').focus(); return false; }); $('body').bind('keydown', 'f', function(){ $('#searchform input').focus(); return false; });
lastAmountBindKey();
// highlight the entry from the url hash // highlight the entry from the url hash
if (window.location.hash && $(window.location.hash)[0]) { if (window.location.hash && $(window.location.hash)[0]) {
@ -48,11 +47,6 @@ $(document).ready(function() {
}); });
}); });
// Add the add-new-row-on-keypress handler to the current last amount field.
function lastAmountBindKey() {
$('.amount-input:last').keypress(addformAddPosting);
}
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// REGISTER CHART // REGISTER CHART
@ -139,18 +133,27 @@ function addformShow(showmsg) {
$('#addmodal').modal('show'); $('#addmodal').modal('show');
} }
// Make sure the add form is empty and clean for display. // Make sure the add form is empty and clean and has the default number of rows.
function addformReset(showmsg) { function addformReset(showmsg) {
showmsg = typeof showmsg !== 'undefined' ? showmsg : false; showmsg = typeof showmsg !== 'undefined' ? showmsg : false;
if ($('form#addform').length > 0) { if ($('form#addform').length > 0) {
if (!showmsg) $('div#message').html(''); if (!showmsg) $('div#message').html('');
$('form#addform')[0].reset(); $('#addform .account-group.added-row').remove();
addformLastAmountBindKey();
$('#addform')[0].reset();
// reset typehead state (though not fetched completions) // reset typehead state (though not fetched completions)
$('.typeahead').typeahead('val', ''); $('.typeahead').typeahead('val', '');
$('.tt-dropdown-menu').hide(); $('.tt-dropdown-menu').hide();
} }
} }
// Set the add-new-row-on-keypress handler on the add form's current last amount field, only.
// (NB: removes all other keypress handlers from all amount fields).
function addformLastAmountBindKey() {
$('.amount-input').off('keypress');
$('.amount-input:last').keypress(addformAddPosting);
}
// Focus the first add form field. // Focus the first add form field.
function addformFocus() { function addformFocus() {
focus($('#addform input#date')); focus($('#addform input#date'));
@ -168,19 +171,14 @@ function addformAddPosting() {
if (!$('#addform').is(':visible')) { if (!$('#addform').is(':visible')) {
return; return;
} }
// Remove the keypress handler from the old last amount field
$('.amount-input:last').off('keypress');
// Clone the old last row to make a new last row // Clone the old last row to make a new last row
$('#addform .account-postings').append( $('#addform .account-group:last').clone() ); $('#addform .account-postings').append( $('#addform .account-group:last').clone().addClass('added-row') );
// renumber and clear the new last account and amount fields // renumber and clear the new last account and amount fields
var n = $('#addform .account-group').length; var n = $('#addform .account-group').length;
$('.account-input:last').prop('placeholder', 'Account '+n).val(''); $('.account-input:last').prop('placeholder', 'Account '+n).val('');
$('.amount-input:last').prop('placeholder','Amount '+n).val(''); // XXX Enable typehead on dynamically created inputs $('.amount-input:last').prop('placeholder','Amount '+n).val(''); // XXX Enable typehead on dynamically created inputs
// and move the keypress handler to the new last amount field
// and add the keypress handler to the new last amount field addformLastAmountBindKey();
lastAmountBindKey();
} }
// Remove the add form's last posting row, if empty, keeping at least two. // Remove the add form's last posting row, if empty, keeping at least two.
@ -197,8 +195,8 @@ function addformDeletePosting() {
if (focuslost) { if (focuslost) {
focus($('.account-input:last')); focus($('.account-input:last'));
} }
// move the keypress handler to the new last amount field
lastAmountBindKey(); addformLastAmountBindKey();
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------