Skip to content

Fire frmEndFormLoading when going to the previous page #3623

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

Open
vivi-the-going-merry wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fire frmEndFormLoading when going to the previous page #3623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c255ad
Fire frmEndFormLoading when going to the previous page
vivi-the-going-merry[bot] Oct 26, 2026
8a64810
Satisfy no-unused-expressions in the new spec
vivi-the-going-merry[bot] Oct 26, 2026
09d7976
Re-enable buttons on bfcache restore after going to the previous page
vivi-the-going-merry[bot] Oct 26, 2026
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
4 changes: 2 additions & 2 deletions js/formidable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1792,7 +1792,7 @@ function frmFrontFormJS() {
return;
}

document.querySelectorAll( '.frm_loading_form' ).forEach( function( form ) {
document.querySelectorAll( '.frm_loading_form, .frm_loading_prev' ).forEach( function( form ) {
form.classList.remove( 'frm_loading_form', 'frm_loading_prev' );
jQuery( form ).trigger( 'frmEndFormLoading' );

Expand Down Expand Up @@ -2274,7 +2274,7 @@ function frmFrontFormJS() {
function enableSubmitButtonOnBackButtonPress() {
window.addEventListener( 'pageshow', function( event ) {
if ( event.persisted ) {
document.querySelectorAll( '.frm_loading_form' ).forEach(
document.querySelectorAll( '.frm_loading_form, .frm_loading_prev' ).forEach(
function( form ) {
enableSubmitButton( form );
}
Expand Down
4 changes: 2 additions & 2 deletions js/formidable.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions tests/cypress/e2e/Forms/frmEndFormLoadingOnPrev.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
describe( 'Form loading state is cleared when going to the previous page', () => {
beforeEach( cy.login );

it( 'fires frmEndFormLoading and removes frm_loading_prev', () => {
cy.visit( '/wp-admin/admin.php?page=formidable-form-templates' );
cy.get( '#frm-form-templates-create-form' ).click();
cy.get( '#text' ).should( 'contain.text', 'Text' ).click();
cy.get( 'a[href*="/wp-admin/admin.php?page=formidable&frm_action=settings&id="]' ).click();

cy.get( '#form_id' ).invoke( 'val' ).then( formId => {
cy.visit( `wp-admin/admin.php?page=formidable&frm_action=settings&id=${ formId }` );

cy.get( '#frm_form_key' ).invoke( 'val' ).then( formKey => {
cy.visit( `/wp-admin/admin-ajax.php?action=frm_forms_preview&form=${ formKey }` );

cy.window().then( win => {
const form = win.document.querySelector( 'form.frm-show-form' );
let ended = 0;
win.jQuery( win.document ).on( 'frmEndFormLoading', () => ended++ );

form.classList.add( 'frm_loading_prev' );
win.frmFrontForm.removeSubmitLoading( win.jQuery( form ) );

expect( ended ).to.equal( 1 );
expect( form.classList.contains( 'frm_loading_prev' ) ).to.equal( false );
} );
} );
} );
} );
} );
Loading