From 475a5be3511e0f042fb546460fef66d8b93a8309 Mon Sep 17 00:00:00 2001 From: Richard Schreiber Date: Mon, 22 Nov 2021 15:12:51 +0100 Subject: [PATCH] Day calendar: Fix missing current-time-bar back for all browsers (#2342) --- src/pretix/static/pretixpresale/js/ui/main.js | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/pretix/static/pretixpresale/js/ui/main.js b/src/pretix/static/pretixpresale/js/ui/main.js index d08b8534bf..c46978e214 100644 --- a/src/pretix/static/pretixpresale/js/ui/main.js +++ b/src/pretix/static/pretixpresale/js/ui/main.js @@ -513,29 +513,31 @@ $(function () { var c = parseInt(this.getAttribute("data-concurrency"), 10); if (c > 9) this.style.setProperty('--concurrency', c); }); + $(".day-calendar").each(function() { - var s = window.getComputedStyle($(".day-timeline > li").get(0)); - - if (s.getPropertyValue('grid-column-start') != "auto") return; // Fix Chrome not being able to use calc-division in grid - $(".day-calendar").each(function() { - var rasterSize = this.getAttribute("data-raster-size"); + var s = window.getComputedStyle($(".day-timeline > li").get(0)); + if (s.getPropertyValue('grid-column-start') != "auto") return; + + var rasterSize = this.getAttribute("data-raster-size"); + var duration = this.getAttribute("data-duration").split(":"); + var cols = duration[0]*60/rasterSize + duration[1]/rasterSize; + + $(".day-timeline", this).css("grid-template-columns", "repeat(" + cols + ", minmax(var(--col-min-size, 3em), 1fr))"); + + $(".day-timeline > li", this).each(function() { + var s = window.getComputedStyle(this); + + var offset = this.getAttribute("data-offset").split(":"); var duration = this.getAttribute("data-duration").split(":"); - var cols = duration[0]*60/rasterSize + duration[1]/rasterSize; - $(".day-timeline", this).css("grid-template-columns", "repeat(" + cols + ", minmax(var(--col-min-size, 3em), 1fr))"); - - $(".day-timeline > li", this).each(function() { - var s = window.getComputedStyle(this); - - var offset = this.getAttribute("data-offset").split(":"); - var duration = this.getAttribute("data-duration").split(":"); - - var columnStart = 1 + offset[0]*60/rasterSize + offset[1]/rasterSize; - var columnSpan = duration[0]*60/rasterSize + duration[1]/rasterSize - this.style.gridColumn = columnStart + " / span " + columnSpan; - }); + var columnStart = 1 + offset[0]*60/rasterSize + offset[1]/rasterSize; + var columnSpan = duration[0]*60/rasterSize + duration[1]/rasterSize + this.style.gridColumn = columnStart + " / span " + columnSpan; }); + }); + + $(".day-calendar").each(function() { var timezone = this.getAttribute("data-timezone"); var startTime = moment.tz(this.getAttribute("data-start"), timezone);