NH_Gooi/nhgooi.nl
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'Add loading text + no items found text' (#13) from feature-news-date-filter into dev

Browse Source 
Reviewed-on: #13
This commit was merged in pull request #13.
This commit is contained in:
JoritWebsight
2025-06-30 17:30:32 +02:00
parent 6abe7ba61a 94eddea78b
commit 4bd72b1349
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/js/functions.js vendored
View File

@@ -47,7 +47,8 @@ $(document).ready(function(){
isLoading = 1; isLoading = 1;
$isLoading.show(); $isLoading.show();
var $button = $(this).attr("disabled", "disabled"); var $button = $(this).attr("disabled", "disabled");
var $container = $(options.container) var $container = $(options.container);
$container.each(function(){$(this).find('.no-results').remove();});
// Fire request for the next page // Fire request for the next page
$.ajax({url: options.url + (options.url.indexOf('?') >= 0 ? '&' : '?') + 'pagina=' + options.nextPage + (options.dateStart ? '&dateStart=' + options.dateStart : '') + (options.dateEnd ? '&dateEnd=' + options.dateEnd : '')}) $.ajax({url: options.url + (options.url.indexOf('?') >= 0 ? '&' : '?') + 'pagina=' + options.nextPage + (options.dateStart ? '&dateStart=' + options.dateStart : '') + (options.dateEnd ? '&dateEnd=' + options.dateEnd : '')})
@@ -56,6 +57,7 @@ $(document).ready(function(){
isLoading = 0; isLoading = 0;
$isLoading.hide(); $isLoading.hide();
$button.removeAttr("disabled"); $button.removeAttr("disabled");
$(options.container + ' .loader').remove();
}) })
.done(function (data) { .done(function (data) {
if (!data) { if (!data) {
@@ -69,6 +71,12 @@ $(document).ready(function(){
var id = this.toString(); var id = this.toString();
$(id).append($('<div>'+data+'</div>').find(id).length ? $('<div>'+data+'</div>').find(id).children() : $(data)); $(id).append($('<div>'+data+'</div>').find(id).length ? $('<div>'+data+'</div>').find(id).children() : $(data));
}); });
$container.each(function () {
var id = this.toString();
if (!$(id).find('li').length) {
$(id).append('<li class="no-results">Geen items gevonden.</li>');
}
});
++options.nextPage; ++options.nextPage;
}); });
} }

2
public/js/functions.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
resources/assets/js/functions/loadMoreNews.js vendored
View File

@@ -25,7 +25,8 @@
isLoading = 1; isLoading = 1;
$isLoading.show(); $isLoading.show();
var $button = $(this).attr("disabled", "disabled"); var $button = $(this).attr("disabled", "disabled");
var $container = $(options.container) var $container = $(options.container);
$container.each(function(){$(this).find('.no-results').remove();});
// Fire request for the next page // Fire request for the next page
$.ajax({url: options.url + (options.url.indexOf('?') >= 0 ? '&' : '?') + 'pagina=' + options.nextPage + (options.dateStart ? '&dateStart=' + options.dateStart : '') + (options.dateEnd ? '&dateEnd=' + options.dateEnd : '')}) $.ajax({url: options.url + (options.url.indexOf('?') >= 0 ? '&' : '?') + 'pagina=' + options.nextPage + (options.dateStart ? '&dateStart=' + options.dateStart : '') + (options.dateEnd ? '&dateEnd=' + options.dateEnd : '')})
@@ -34,6 +35,7 @@
isLoading = 0; isLoading = 0;
$isLoading.hide(); $isLoading.hide();
$button.removeAttr("disabled"); $button.removeAttr("disabled");
$(options.container + ' .loader').remove();
}) })
.done(function (data) { .done(function (data) {
if (!data) { if (!data) {
@@ -47,6 +49,12 @@
var id = this.toString(); var id = this.toString();
$(id).append($('<div>'+data+'</div>').find(id).length ? $('<div>'+data+'</div>').find(id).children() : $(data)); $(id).append($('<div>'+data+'</div>').find(id).length ? $('<div>'+data+'</div>').find(id).children() : $(data));
}); });
$container.each(function () {
var id = this.toString();
if (!$(id).find('li').length) {
$(id).append('<li class="no-results">Geen items gevonden.</li>');
}
});
++options.nextPage; ++options.nextPage;
}); });
} }

2
resources/views/news.blade.php
View File

@@ -53,8 +53,8 @@
options.dateStart = start.format('YYYY-MM-DD'); options.dateStart = start.format('YYYY-MM-DD');
options.dateEnd = end.format('YYYY-MM-DD'); options.dateEnd = end.format('YYYY-MM-DD');
options.nextPage = 1; options.nextPage = 1;
console.log(options);
$('.content_container #items-more-news li').remove(); $('.content_container #items-more-news li').remove();
$('.content_container #items-more-news').append('<li class="loader"><span class="fas fa-spinner fa-spin"></span> Laden...</li>');
$moreNews.loadMoreNews(options); $moreNews.loadMoreNews(options);
$moreNews.click(); $moreNews.click();
}); });