Sync dev with master #260

Merged
GCG.Admin (Automatisiert) merged 5 commits from master into dev 2024-01-26 09:23:24 +01:00
Showing only changes of commit c9c4658208 - Show all commits

@ -18,7 +18,7 @@
} }
// load scripts // load scripts
$(window).on('load', () => { $(window).on('load', function() {
$('.preloader').fadeOut(100); $('.preloader').fadeOut(100);
adaptHeight(); adaptHeight();
if ($('#top-banner').length) { if ($('#top-banner').length) {
@ -48,7 +48,7 @@
}); });
// venobox popup // venobox popup
$(document).ready(() => { $(document).ready(function() {
$('.vb-video').venobox({ spinner: 'grid' }); $('.vb-video').venobox({ spinner: 'grid' });
$('.vb-gallery').venobox({ $('.vb-gallery').venobox({
selector: '.vb-gallery', selector: '.vb-gallery',
@ -61,14 +61,14 @@
}); });
// filter // filter
$(document).ready(() => { $(document).ready(function() {
if ($('.filter-container').length != 0) { if ($('.filter-container').length != 0) {
const shuffleInstance = new Shuffle($('.filter-container'), { const shuffleInstance = new Shuffle($('.filter-container'), {
itemSelector: '.filter-item', itemSelector: '.filter-item',
sizer: '.filter-sizer', sizer: '.filter-sizer',
delimiter: ',' delimiter: ','
}); });
$('.filter-controls li').on('click',() => { $('.filter-controls li').on('click', function() {
$('.filter-controls li').removeClass('active'); $('.filter-controls li').removeClass('active');
$(this).addClass('active'); $(this).addClass('active');
shuffleInstance.filter($(this).data('filter')) shuffleInstance.filter($(this).data('filter'))
@ -77,27 +77,27 @@
}); });
// counter // counter
$(window).on('scroll', () => { $(window).on('scroll', function() {
var oTop; var oTop;
if ($('.count').length !== 0) { if ($('.count').length !== 0) {
oTop = $('.count').offset().top - window.innerHeight; oTop = $('.count').offset().top - window.innerHeight;
} }
if ($(window).scrollTop() > oTop) { if ($(window).scrollTop() > oTop) {
$('.count').each(() => { $('.count').each(function() {
var $this = $(this), countTo = $this.attr('data-count'); var $this = $(this), countTo = $this.attr('data-count');
$({ countNum: $this.text() }).animate( $({ countNum: $this.text() }).animate(
{ countNum: countTo }, { countNum: countTo },
{ {
duration: 1000, duration: 1000,
easing: 'swing', easing: 'swing',
step: () => $this.text(Math.floor(this.countNum)), step: function() { return $this.text(Math.floor(this.countNum)) },
complete: () => $this.text(this.countNum) complete: function() { return $this.text(this.countNum) },
}); });
}); });
} }
}); });
$(window).on('DOMContentLoaded', () => { $(window).on('DOMContentLoaded', function() {
if (window.PagefindUI != undefined) { if (window.PagefindUI != undefined) {
new window.PagefindUI({ new window.PagefindUI({
element: "#search", element: "#search",
@ -108,7 +108,7 @@
} }
}); });
$('#pagefind-search').on('shown.bs.modal', () => { $('#pagefind-search').on('shown.bs.modal', function() {
$('.pagefind-ui__search-input').focus(); $('.pagefind-ui__search-input').focus();
}); });
} }
@ -120,7 +120,7 @@
_paq.push(["disableCookies"]); _paq.push(["disableCookies"]);
_paq.push(['trackPageView']); _paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']); _paq.push(['enableLinkTracking']);
(() => { (function() {
var u="https://analytics.cantorgymnasium.de/"; var u="https://analytics.cantorgymnasium.de/";
_paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', '1']); _paq.push(['setSiteId', '1']);