Skip to content

fix ajax-form loading state not restoring after AJAX completes #68

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
dza2000 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix ajax-form loading state not restoring after AJAX completes #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed1af06
fix ajax-form loading state not restoring after AJAX completes
dza2000 Apr 21, 2026
e968184
Merge upstream/master — fix ajax-form loading state bug
dza2000 Apr 21, 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
36 changes: 26 additions & 10 deletions dist/js/core-styles/ajax-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ $(function() {
let url = $this.attr('action');
let data = $this.serializeArray();
let $target = $this;
let useLoadingIndicator = !$this.is('[data-disable-loading-indicator]');
let $submitBtn = $this.find('[type="submit"]');

if( $this.is('[data-disable-loading-indicator]') ) {
} else {
$this.find('button', 'input[type="submit"]').each(function(){
let $button = $(this);
$button.prop('disabled', true);
$button.val('Loading...');
$button.text('Loading...');
});
if (useLoadingIndicator) {
if (!$submitBtn.data('ajax-form-original-html')) {
$submitBtn.data('ajax-form-original-html', $submitBtn.html());
}
$submitBtn.html('<i class="fa-solid fa-spinner fa-spin"></i><span class="d-none d-sm-inline ms-1"> Loading</span>');
$submitBtn.prop('disabled', true);
}

if( $this.is('[data-target]') ){
Expand All @@ -83,22 +83,38 @@ $(function() {
$target = $this.parent();
}

$target.load(url,data,function(){
$target.load(url, data, function(){
if( $this.is('[data-power-bar]') ){ loadShoppingListPowerBar(); }
if( $this.is('[data-load-on-callback]') && $this.is('[data-target-on-callback]') ){
loadOnCallback();
}
if (useLoadingIndicator) {
let originalHtml = $submitBtn.data('ajax-form-original-html');
if (originalHtml) {
$submitBtn.html(originalHtml);
$submitBtn.prop('disabled', false);
}
}
});

function loadOnCallback() {
let callbackUrls = $this.data('load-on-callback').split(',');
let callbackTargets = $($this.data('target-on-callback'));
callbackUrls.forEach(function(callbackUrl, index){
let $callbackTarget = $(callbackTargets[index]);
let $callbackTarget = $(callbackTargets[index]);
$callbackTarget.load(callbackUrl);
});
}

});

// Re-enable the submit button when the user modifies the text input after a search
$(document).on('input', '[data-ajax-form] [type="text"]', function() {
let $submitBtn = $(this).closest('[data-ajax-form]').find('[type="submit"]');
if ($submitBtn.prop('disabled') && $submitBtn.data('ajax-form-original-html')) {
$submitBtn.html($submitBtn.data('ajax-form-original-html'));
$submitBtn.prop('disabled', false);
}
});

});
36 changes: 26 additions & 10 deletions js/core-styles/ajax-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ $(function() {
let url = $this.attr('action');
let data = $this.serializeArray();
let $target = $this;
let useLoadingIndicator = !$this.is('[data-disable-loading-indicator]');
let $submitBtn = $this.find('[type="submit"]');

if( $this.is('[data-disable-loading-indicator]') ) {
} else {
$this.find('button', 'input[type="submit"]').each(function(){
let $button = $(this);
$button.prop('disabled', true);
$button.val('Loading...');
$button.text('Loading...');
});
if (useLoadingIndicator) {
if (!$submitBtn.data('ajax-form-original-html')) {
$submitBtn.data('ajax-form-original-html', $submitBtn.html());
}
$submitBtn.html('<i class="fa-solid fa-spinner fa-spin"></i><span class="d-none d-sm-inline ms-1"> Loading</span>');
$submitBtn.prop('disabled', true);
}

if( $this.is('[data-target]') ){
Expand All @@ -83,22 +83,38 @@ $(function() {
$target = $this.parent();
}

$target.load(url,data,function(){
$target.load(url, data, function(){
if( $this.is('[data-power-bar]') ){ loadShoppingListPowerBar(); }
if( $this.is('[data-load-on-callback]') && $this.is('[data-target-on-callback]') ){
loadOnCallback();
}
if (useLoadingIndicator) {
let originalHtml = $submitBtn.data('ajax-form-original-html');
if (originalHtml) {
$submitBtn.html(originalHtml);
$submitBtn.prop('disabled', false);
}
}
});

function loadOnCallback() {
let callbackUrls = $this.data('load-on-callback').split(',');
let callbackTargets = $($this.data('target-on-callback'));
callbackUrls.forEach(function(callbackUrl, index){
let $callbackTarget = $(callbackTargets[index]);
let $callbackTarget = $(callbackTargets[index]);
$callbackTarget.load(callbackUrl);
});
}

});

// Re-enable the submit button when the user modifies the text input after a search
$(document).on('input', '[data-ajax-form] [type="text"]', function() {
let $submitBtn = $(this).closest('[data-ajax-form]').find('[type="submit"]');
if ($submitBtn.prop('disabled') && $submitBtn.data('ajax-form-original-html')) {
$submitBtn.html($submitBtn.data('ajax-form-original-html'));
$submitBtn.prop('disabled', false);
}
});

});