Add loading text + no items found text
Remove logging
This commit is contained in:
10
public/js/functions.js
vendored
10
public/js/functions.js
vendored
@@ -47,7 +47,8 @@ $(document).ready(function(){
|
||||
isLoading = 1;
|
||||
$isLoading.show();
|
||||
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
|
||||
$.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.hide();
|
||||
$button.removeAttr("disabled");
|
||||
$(options.container + ' .loader').remove();
|
||||
})
|
||||
.done(function (data) {
|
||||
if (!data) {
|
||||
@@ -69,6 +71,12 @@ $(document).ready(function(){
|
||||
var id = this.toString();
|
||||
$(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;
|
||||
});
|
||||
}
|
||||
|
||||
2
public/js/functions.min.js
vendored
2
public/js/functions.min.js
vendored
File diff suppressed because one or more lines are too long
10
resources/assets/js/functions/loadMoreNews.js
vendored
10
resources/assets/js/functions/loadMoreNews.js
vendored
@@ -25,7 +25,8 @@
|
||||
isLoading = 1;
|
||||
$isLoading.show();
|
||||
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
|
||||
$.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.hide();
|
||||
$button.removeAttr("disabled");
|
||||
$(options.container + ' .loader').remove();
|
||||
})
|
||||
.done(function (data) {
|
||||
if (!data) {
|
||||
@@ -47,6 +49,12 @@
|
||||
var id = this.toString();
|
||||
$(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;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -53,8 +53,8 @@
|
||||
options.dateStart = start.format('YYYY-MM-DD');
|
||||
options.dateEnd = end.format('YYYY-MM-DD');
|
||||
options.nextPage = 1;
|
||||
console.log(options);
|
||||
$('.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.click();
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user