Skip to content

Support docassemble 1.10 button groups #1118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nonprofittechy wants to merge 1 commit into
base: v5
Choose a base branch
from
Draft

Support docassemble 1.10 button groups #1118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/scope.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,9 +557,9 @@ module.exports = {
},

continue_button_selector: `fieldset.da-field-buttons button[type="submit"].btn-primary`,
continue_button_selector_backup: `.da-fieldset.da-field-buttons button[type="submit"].btn-primary`,
continue_button_selector_backup: `.da-fieldset.da-field-buttons button[type="submit"].btn-primary, .da-button-set.da-field-buttons button[type="submit"].btn-primary`,
signature_selector: `fieldset .dasigsave`,
signature_selector_backup: `.da-fieldset .dasigsave`,
signature_selector_backup: `.da-fieldset .dasigsave, .da-button-set .dasigsave`,
continue: async function ( scope ) {
/* Presses whatever button it finds that might lead to the next page. */
// Any selectors I find seem somewhat precarious.
Expand Down Expand Up @@ -963,7 +963,7 @@ module.exports = {
// All the different types of fields
// buttons, canvases, inputs of all kinds, selects (dropdowns), textareas. Are there more?
// Will deal with `option` once inside `select`
let all_nodes = $( `#dasigpage, fieldset button, .da-fieldset button, .daquestionactionbutton, fieldset input, da-fieldset input, .da-form-group input, .da-form-group select, form select, .da-form-group textarea` );
let all_nodes = $( `#dasigpage, fieldset button, .da-fieldset button, .da-button-set button, .daquestionactionbutton, fieldset input, da-fieldset input, .da-form-group input, .da-form-group select, form select, .da-form-group textarea` );
for ( let node of all_nodes ) {
// Decision: Do not abstract the below. There's too much data to pass around for it to make sense
let $node = $( node );
Expand Down
8 changes: 8 additions & 0 deletions tests/unit_tests/getAllFields.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,3 +170,11 @@ it(`creates the right data for a question whose table will have mixed quotes`, a
let result = await getAllFields( scope, { html: html.mixed_quotes });
expect( result ).to.deep.equalInAnyOrder( fields.mixed_quotes );
});

for (const fixture of ['button_continue', 'buttons_yesnomaybe', 'buttons_other']) {
it(`recognizes docassemble 1.10 div button groups: ${fixture}`, async function() {
const markup = html[fixture].replace(/<fieldset\b/g, '<div').replace(/<\/fieldset>/g, '</div>');
const result = await getAllFields(scope, {html: markup});
expect(result).to.deep.equalInAnyOrder(fields[fixture]);
});
}
Loading