Release v2.15.2
This commit is contained in:
1 parent
ddcc665f81
commit
7295f83f04
43 files changed
+2526
-104
No files matched your search
@@ -193,12 +193,18 @@ function matchesScheduleRule(rule, now) {
|
||||
// Determine whether a slide should be shown at the current time.
|
||||
function isSlideActive(slide, now) {
|
||||
const rules = Array.isArray(slide.scheduleRules) ? slide.scheduleRules : [];
|
||||
if (!rules.length) {
|
||||
return true;
|
||||
}
|
||||
return rules.some(function (rule) {
|
||||
if (rules.length && !rules.some(function (rule) {
|
||||
return matchesScheduleRule(rule, now);
|
||||
});
|
||||
})) {
|
||||
return false;
|
||||
}
|
||||
const groupRules = parseScheduleRules(slide.groupScheduleRules || slide.group_schedule_rules_json);
|
||||
if (slide.groupKey && groupRules.length && !groupRules.some(function (rule) {
|
||||
return matchesScheduleRule(rule, now);
|
||||
})) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
// Build the cache key for a template layout.
|
||||
function getTemplateLayoutCacheKey(template) {
|
||||
|
||||
Reference in new issue
Block a user