add-to-calendar-button 2.12.3 → 2.12.5

package/README.md

@@ -290,6 +290,7 @@ In doubt, simply ask and we find a way. :)
 <a href="https://github.com/acm-will"><img src="https://avatars.githubusercontent.com/u/103984058?v=4" title="acm-will" width="60" height="60"></a>
 <a href="https://github.com/sukharenko"><img src="https://avatars.githubusercontent.com/u/2049036?v=4" title="Yevgen Sukharenko" width="60" height="60"></a>
 <a href="https://github.com/pbaumard"><img src="https://avatars.githubusercontent.com/u/6176006?v=4" title="Pierre Baumard" width="60" height="60"></a>
+<a href="https://github.com/rocky-premise"><img src="https://avatars.githubusercontent.com/u/230592673?v=4" title="Rocky Assad" width="60" height="60"></a>
 <a href="https://github.com/brenjt"><img src="https://avatars.githubusercontent.com/u/1713885?v=4" title="Brennan" width="60" height="60"></a>
 <a href="https://github.com/chris-at-fabius-labs"><img src="https://avatars.githubusercontent.com/u/108754665?v=4" title="chris-at-fabius-labs" width="60" height="60"></a>
 <a href="https://github.com/ssaaiidd"><img src="https://avatars.githubusercontent.com/u/29234802?v=4" title="ssaaiidd" width="60" height="60"></a>

package/assets/css/atcb-3d.css

@@ -5,7 +5,7 @@
  *
  * Style: 3D
  *
- * Version: 2.12.3
+ * Version: 2.12.5
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

package/assets/css/atcb-date.css

@@ -5,7 +5,7 @@
  *
  * Style: Date
  *
- * Version: 2.12.3
+ * Version: 2.12.5
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

package/assets/css/atcb-flat.css

@@ -5,7 +5,7 @@
  *
  * Style: Flat
  *
- * Version: 2.12.3
+ * Version: 2.12.5
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

package/assets/css/atcb-neumorphism.css

@@ -5,7 +5,7 @@
  *
  * Style: Neumorphism
  *
- * Version: 2.12.3
+ * Version: 2.12.5
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

package/assets/css/atcb-round.css

@@ -5,7 +5,7 @@
  *
  * Style: Round
  *
- * Version: 2.12.3
+ * Version: 2.12.5
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

package/assets/css/atcb-simple.css

@@ -5,7 +5,7 @@
  *
  * Style: Simple
  *
- * Version: 2.12.3
+ * Version: 2.12.5
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

package/assets/css/atcb-text.css

@@ -5,7 +5,7 @@
  *
  * Style: Text
  *
- * Version: 2.12.3
+ * Version: 2.12.5
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

package/assets/css/atcb.css

@@ -5,7 +5,7 @@
  *
  * Style: Default
  *
- * Version: 2.12.3
+ * Version: 2.12.5
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

package/dist/atcb-no-pro-unstyle.js

@@ -223,14 +223,14 @@ function tzlib_get_timezones(jsonType = false) {
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.12.3
+ *  Version: 2.12.5
  *  Creator: Jens Kuerschner (https://jekuer.com)
  *  Project: https://github.com/add2cal/add-to-calendar-button
  *  License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
  *  Note:    DO NOT REMOVE THE COPYRIGHT NOTICE ABOVE!
  *
  */
-const atcbVersion = '2.12.3';
+const atcbVersion = '2.12.5';
 const atcbCssTemplate = {};
 const atcbIsBrowser = () => {
   if (typeof window === 'undefined') {
@@ -572,11 +572,11 @@ function atcb_decorate_data_rrule(data) {
     data.recurrence_frequency = data.recurrence;
     data.recurrence = 'RRULE:FREQ=' + data.recurrence + ';WKST=' + data.recurrence_weekstart + ';INTERVAL=' + data.recurrence_interval;
     if (data.recurrence_until && data.recurrence_until !== '') {
-      if (data.endTime && data.endTime !== '') {
-        data.recurrence = data.recurrence + ';UNTIL=' + data.recurrence_until.replace(/-/g, '').slice(0, 8) + 'T' + data.endTime.replace(':', '') + '00';
-      } else {
-        data.recurrence = data.recurrence + ';UNTIL=' + data.recurrence_until.replace(/-/g, '').slice(0, 8);
+      data.recurrence_until = data.recurrence_until.replace(/[-:]/g, '');
+      if (data.recurrence_until.length < 9) {
+        data.recurrence_until += 'T235959Z';
       }
+      data.recurrence = data.recurrence + ';UNTIL=' + data.recurrence_until;
     }
     if (data.recurrence_count && data.recurrence_count !== '') {
       data.recurrence = data.recurrence + ';COUNT=' + data.recurrence_count;
@@ -597,13 +597,14 @@ function atcb_decorate_data_recurring_events(data) {
   const startDate = data.dates?.[0].startDate || data.startDate;
   const startTime = data.dates?.[0].startTime || data.startTime;
   const startDateTime = (function () {
-    if (startTime) {
+    if (startTime && startTime !== '') {
       const offset = tzlib_get_offset(data.dates?.[0].timeZone || data.timeZone, startDate, startTime);
       return new Date(startDate + ' ' + startTime + ':00 GMT' + offset);
     }
     return new Date(startDate + 'T00:00:00Z');
   })();
-  const occurenceData = atcb_getNextOccurrence(data.recurrence, startDateTime);
+  const isAllDay = !(startTime && startTime !== '');
+  const occurenceData = atcb_getNextOccurrence(data.recurrence, startDateTime, isAllDay);
   if (!occurenceData || !occurenceData.nextOccurrence) {
     return data;
   }
@@ -909,7 +910,7 @@ function atcb_set_online_event_flag(data, i) {
   if (dateEntry.location && dateEntry.location.startsWith('http')) {
     dateEntry.onlineEvent = true;
   } else {
-    dateEntry.v = false;
+    dateEntry.onlineEvent = false;
   }
   return data;
 }
@@ -918,12 +919,12 @@ function atcb_replace_custom_variables(data, i) {
   const dateEntry = data.dates[`${i}`];
   for (const key in data.customVar) {
     const value = data.customVar[`${key}`];
-    dateEntry.name = atcb_replace_placeholder(dateEntry.name, value);
-    dateEntry.location = atcb_replace_placeholder(dateEntry.location, value);
+    dateEntry.name = atcb_replace_placeholder(dateEntry.name, key, value);
+    dateEntry.location = atcb_replace_placeholder(dateEntry.location, key, value);
   }
   return data;
 }
-function atcb_replace_placeholder(text, value) {
+function atcb_replace_placeholder(text, key, value) {
   const placeholder = '%%' + key.replace(/[^\w\-.]/g, '') + '%%';
   if (!text) return text;
   // eslint-disable-next-line security/detect-non-literal-regexp
@@ -1335,8 +1336,8 @@ async function atcb_validate_rrule_simplyfied(data, msgPrefix) {
   if (data.recurrence_interval && (data.recurrence_interval < 1 || data.recurrence_interval % 1 !== 0)) {
     throw new Error(msgPrefix + ' failed: recurrence data (interval) misspelled');
   }
-  if (data.recurrence_until && data.recurrence_until !== '' && !/^[\d\-:]+$/.test(data.recurrence_until)) {
-    throw new Error(msgPrefix + ' failed: recurrence data (until) misspelled');
+  if (data.recurrence_until && data.recurrence_until !== '' && !/^\d{8}T\d{6}Z$/.test(data.recurrence_until)) {
+    throw new Error(msgPrefix + ' failed: recurrence data (until) misspelled - must be in format YYYYMMDDTHHMMSSZ');
   }
   if (data.recurrence_count && (data.recurrence_count < 1 || data.recurrence_count % 1 !== 0)) {
     throw new Error(msgPrefix + ' failed: recurrence data (count) misspelled');
@@ -3090,7 +3091,6 @@ function atcb_translate_via_time_zone(date, time, baseTimeZone, targetTimeZone)
 }
 function atcb_generate_timestring(dates, language = 'en', subEvent = 'all', decorate = false, browserTimeOverride = false, enforceYear = false, hideTimeZone = false) {
   if (decorate) {
-    dates = atcb_decorate_data_recurrence({ dates: dates }).dates;
     dates = atcb_decorate_data_dates({ dates: dates }).dates;
   }
   let startDateInfo, endDateInfo, timeZoneInfoStart, timeZoneInfoEnd;
@@ -3592,12 +3592,18 @@ function matchesImplicitRules(date, rrule, startDate) {
   if (rrule.FREQ === 'YEARLY' && !rrule.BYMONTHDAY && !rrule.BYWEEKDAY && !rrule.BYYEARDAY && !rrule.BYWEEKNO && date.getUTCDate() !== startDate.getUTCDate()) return false;
   return true;
 }
-function atcb_getNextOccurrence(rruleStr, startDateTime) {
+function atcb_getNextOccurrence(rruleStr, startDateTime, allday) {
   const rrule = atcb_parseRRule(rruleStr);
+  if (allday && rrule.UNTIL instanceof Date) {
+    const untilEod = new Date(rrule.UNTIL);
+    untilEod.setUTCHours(23, 59, 59, 999);
+    rrule.UNTIL = untilEod;
+  }
   const now = new Date();
+  now.setUTCHours(0, 0, 0, 0);
   const stepMs = rrule.BYHOUR ? 60 * 60 * 1000 : 24 * 60 * 60 * 1000;
   let currentDate = startDateTime;
-  let occurrences = [];
+  const occurrences = [];
   let count = 0;
   let maxIterations = 10000;
   while (true) {
@@ -3605,19 +3611,18 @@ function atcb_getNextOccurrence(rruleStr, startDateTime) {
       occurrences.push(currentDate);
       count++;
       if (rrule.COUNT && count >= rrule.COUNT) break;
-      if (!rrule.COUNT && !rrule.UNTIL && occurrences.length > 0 && currentDate > now) break; 
+      if (!rrule.COUNT && !rrule.UNTIL && occurrences.length > 0 && (allday ? currentDate >= now : currentDate > now)) break;
     }
     if (rrule.UNTIL && currentDate > rrule.UNTIL) break;
     currentDate = new Date(currentDate.getTime() + stepMs);
     if (--maxIterations <= 0) {
-      console.log('Max iterations reached. Using what got calculated so far.');
       break;
     }
   }
   let nextDate = null;
   let countDate = 0;
-  for (let d of occurrences) {
-    if (d > now) {
+  for (const d of occurrences) {
+    if (allday ? d >= now : d > now) {
       nextDate = d;
       break;
     }
@@ -5373,10 +5378,18 @@ function atcb_global_listener_keydown(event) {
       if (event.key === 'ArrowDown' && currFocusOption.dataset.optionNumber < optionListCount) {
         targetFocus = parseInt(currFocusOption.dataset.optionNumber) + 1;
       } else if (event.key === 'Tab') {
-        if (currFocusOption.dataset.optionNumber < optionListCount) {
-          targetFocus = parseInt(currFocusOption.dataset.optionNumber) + 1;
+        if (event.shiftKey) {
+          if (currFocusOption.dataset.optionNumber > 1) {
+            targetFocus = parseInt(currFocusOption.dataset.optionNumber) - 1;
+          } else {
+            targetFocus = optionListCount;
+          }
         } else {
-          targetFocus = 1;
+          if (currFocusOption.dataset.optionNumber < optionListCount) {
+            targetFocus = parseInt(currFocusOption.dataset.optionNumber) + 1;
+          } else {
+            targetFocus = 1;
+          }
         }
       } else if (event.key === 'ArrowUp' && currFocusOption.dataset.optionNumber >= 1) {
         targetFocus = parseInt(currFocusOption.dataset.optionNumber) - 1;

package/dist/atcb-no-pro.js

@@ -223,14 +223,14 @@ function tzlib_get_timezones(jsonType = false) {
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.12.3
+ *  Version: 2.12.5
  *  Creator: Jens Kuerschner (https://jekuer.com)
  *  Project: https://github.com/add2cal/add-to-calendar-button
  *  License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
  *  Note:    DO NOT REMOVE THE COPYRIGHT NOTICE ABOVE!
  *
  */
-const atcbVersion = '2.12.3';
+const atcbVersion = '2.12.5';
 const atcbCssTemplate = {
   if (typeof window === 'undefined') {
     return false;
@@ -571,11 +571,11 @@ function atcb_decorate_data_rrule(data) {
     data.recurrence_frequency = data.recurrence;
     data.recurrence = 'RRULE:FREQ=' + data.recurrence + ';WKST=' + data.recurrence_weekstart + ';INTERVAL=' + data.recurrence_interval;
     if (data.recurrence_until && data.recurrence_until !== '') {
-      if (data.endTime && data.endTime !== '') {
-        data.recurrence = data.recurrence + ';UNTIL=' + data.recurrence_until.replace(/-/g, '').slice(0, 8) + 'T' + data.endTime.replace(':', '') + '00';
-      } else {
-        data.recurrence = data.recurrence + ';UNTIL=' + data.recurrence_until.replace(/-/g, '').slice(0, 8);
+      data.recurrence_until = data.recurrence_until.replace(/[-:]/g, '');
+      if (data.recurrence_until.length < 9) {
+        data.recurrence_until += 'T235959Z';
       }
+      data.recurrence = data.recurrence + ';UNTIL=' + data.recurrence_until;
     }
     if (data.recurrence_count && data.recurrence_count !== '') {
       data.recurrence = data.recurrence + ';COUNT=' + data.recurrence_count;
@@ -596,13 +596,14 @@ function atcb_decorate_data_recurring_events(data) {
   const startDate = data.dates?.[0].startDate || data.startDate;
   const startTime = data.dates?.[0].startTime || data.startTime;
   const startDateTime = (function () {
-    if (startTime) {
+    if (startTime && startTime !== '') {
       const offset = tzlib_get_offset(data.dates?.[0].timeZone || data.timeZone, startDate, startTime);
       return new Date(startDate + ' ' + startTime + ':00 GMT' + offset);
     }
     return new Date(startDate + 'T00:00:00Z');
   })();
-  const occurenceData = atcb_getNextOccurrence(data.recurrence, startDateTime);
+  const isAllDay = !(startTime && startTime !== '');
+  const occurenceData = atcb_getNextOccurrence(data.recurrence, startDateTime, isAllDay);
   if (!occurenceData || !occurenceData.nextOccurrence) {
     return data;
   }
@@ -908,7 +909,7 @@ function atcb_set_online_event_flag(data, i) {
   if (dateEntry.location && dateEntry.location.startsWith('http')) {
     dateEntry.onlineEvent = true;
   } else {
-    dateEntry.v = false;
+    dateEntry.onlineEvent = false;
   }
   return data;
 }
@@ -917,12 +918,12 @@ function atcb_replace_custom_variables(data, i) {
   const dateEntry = data.dates[`${i}`];
   for (const key in data.customVar) {
     const value = data.customVar[`${key}`];
-    dateEntry.name = atcb_replace_placeholder(dateEntry.name, value);
-    dateEntry.location = atcb_replace_placeholder(dateEntry.location, value);
+    dateEntry.name = atcb_replace_placeholder(dateEntry.name, key, value);
+    dateEntry.location = atcb_replace_placeholder(dateEntry.location, key, value);
   }
   return data;
 }
-function atcb_replace_placeholder(text, value) {
+function atcb_replace_placeholder(text, key, value) {
   const placeholder = '%%' + key.replace(/[^\w\-.]/g, '') + '%%';
   if (!text) return text;
   // eslint-disable-next-line security/detect-non-literal-regexp
@@ -1334,8 +1335,8 @@ async function atcb_validate_rrule_simplyfied(data, msgPrefix) {
   if (data.recurrence_interval && (data.recurrence_interval < 1 || data.recurrence_interval % 1 !== 0)) {
     throw new Error(msgPrefix + ' failed: recurrence data (interval) misspelled');
   }
-  if (data.recurrence_until && data.recurrence_until !== '' && !/^[\d\-:]+$/.test(data.recurrence_until)) {
-    throw new Error(msgPrefix + ' failed: recurrence data (until) misspelled');
+  if (data.recurrence_until && data.recurrence_until !== '' && !/^\d{8}T\d{6}Z$/.test(data.recurrence_until)) {
+    throw new Error(msgPrefix + ' failed: recurrence data (until) misspelled - must be in format YYYYMMDDTHHMMSSZ');
   }
   if (data.recurrence_count && (data.recurrence_count < 1 || data.recurrence_count % 1 !== 0)) {
     throw new Error(msgPrefix + ' failed: recurrence data (count) misspelled');
@@ -3089,7 +3090,6 @@ function atcb_translate_via_time_zone(date, time, baseTimeZone, targetTimeZone)
 }
 function atcb_generate_timestring(dates, language = 'en', subEvent = 'all', decorate = false, browserTimeOverride = false, enforceYear = false, hideTimeZone = false) {
   if (decorate) {
-    dates = atcb_decorate_data_recurrence({ dates: dates }).dates;
     dates = atcb_decorate_data_dates({ dates: dates }).dates;
   }
   let startDateInfo, endDateInfo, timeZoneInfoStart, timeZoneInfoEnd;
@@ -3591,12 +3591,18 @@ function matchesImplicitRules(date, rrule, startDate) {
   if (rrule.FREQ === 'YEARLY' && !rrule.BYMONTHDAY && !rrule.BYWEEKDAY && !rrule.BYYEARDAY && !rrule.BYWEEKNO && date.getUTCDate() !== startDate.getUTCDate()) return false;
   return true;
 }
-function atcb_getNextOccurrence(rruleStr, startDateTime) {
+function atcb_getNextOccurrence(rruleStr, startDateTime, allday) {
   const rrule = atcb_parseRRule(rruleStr);
+  if (allday && rrule.UNTIL instanceof Date) {
+    const untilEod = new Date(rrule.UNTIL);
+    untilEod.setUTCHours(23, 59, 59, 999);
+    rrule.UNTIL = untilEod;
+  }
   const now = new Date();
+  now.setUTCHours(0, 0, 0, 0);
   const stepMs = rrule.BYHOUR ? 60 * 60 * 1000 : 24 * 60 * 60 * 1000;
   let currentDate = startDateTime;
-  let occurrences = [];
+  const occurrences = [];
   let count = 0;
   let maxIterations = 10000;
   while (true) {
@@ -3604,19 +3610,18 @@ function atcb_getNextOccurrence(rruleStr, startDateTime) {
       occurrences.push(currentDate);
       count++;
       if (rrule.COUNT && count >= rrule.COUNT) break;
-      if (!rrule.COUNT && !rrule.UNTIL && occurrences.length > 0 && currentDate > now) break; 
+      if (!rrule.COUNT && !rrule.UNTIL && occurrences.length > 0 && (allday ? currentDate >= now : currentDate > now)) break;
     }
     if (rrule.UNTIL && currentDate > rrule.UNTIL) break;
     currentDate = new Date(currentDate.getTime() + stepMs);
     if (--maxIterations <= 0) {
-      console.log('Max iterations reached. Using what got calculated so far.');
       break;
     }
   }
   let nextDate = null;
   let countDate = 0;
-  for (let d of occurrences) {
-    if (d > now) {
+  for (const d of occurrences) {
+    if (allday ? d >= now : d > now) {
       nextDate = d;
       break;
     }
@@ -5372,10 +5377,18 @@ function atcb_global_listener_keydown(event) {
       if (event.key === 'ArrowDown' && currFocusOption.dataset.optionNumber < optionListCount) {
         targetFocus = parseInt(currFocusOption.dataset.optionNumber) + 1;
       } else if (event.key === 'Tab') {
-        if (currFocusOption.dataset.optionNumber < optionListCount) {
-          targetFocus = parseInt(currFocusOption.dataset.optionNumber) + 1;
+        if (event.shiftKey) {
+          if (currFocusOption.dataset.optionNumber > 1) {
+            targetFocus = parseInt(currFocusOption.dataset.optionNumber) - 1;
+          } else {
+            targetFocus = optionListCount;
+          }
         } else {
-          targetFocus = 1;
+          if (currFocusOption.dataset.optionNumber < optionListCount) {
+            targetFocus = parseInt(currFocusOption.dataset.optionNumber) + 1;
+          } else {
+            targetFocus = 1;
+          }
         }
       } else if (event.key === 'ArrowUp' && currFocusOption.dataset.optionNumber >= 1) {
         targetFocus = parseInt(currFocusOption.dataset.optionNumber) - 1;

package/dist/atcb-unstyle.js

@@ -223,14 +223,14 @@ function tzlib_get_timezones(jsonType = false) {
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.12.3
+ *  Version: 2.12.5
  *  Creator: Jens Kuerschner (https://jekuer.com)
  *  Project: https://github.com/add2cal/add-to-calendar-button
  *  License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
  *  Note:    DO NOT REMOVE THE COPYRIGHT NOTICE ABOVE!
  *
  */
-const atcbVersion = '2.12.3';
+const atcbVersion = '2.12.5';
 const atcbCssTemplate = {};
 const atcbIsBrowser = () => {
   if (typeof window === 'undefined') {
@@ -572,11 +572,11 @@ function atcb_decorate_data_rrule(data) {
     data.recurrence_frequency = data.recurrence;
     data.recurrence = 'RRULE:FREQ=' + data.recurrence + ';WKST=' + data.recurrence_weekstart + ';INTERVAL=' + data.recurrence_interval;
     if (data.recurrence_until && data.recurrence_until !== '') {
-      if (data.endTime && data.endTime !== '') {
-        data.recurrence = data.recurrence + ';UNTIL=' + data.recurrence_until.replace(/-/g, '').slice(0, 8) + 'T' + data.endTime.replace(':', '') + '00';
-      } else {
-        data.recurrence = data.recurrence + ';UNTIL=' + data.recurrence_until.replace(/-/g, '').slice(0, 8);
+      data.recurrence_until = data.recurrence_until.replace(/[-:]/g, '');
+      if (data.recurrence_until.length < 9) {
+        data.recurrence_until += 'T235959Z';
       }
+      data.recurrence = data.recurrence + ';UNTIL=' + data.recurrence_until;
     }
     if (data.recurrence_count && data.recurrence_count !== '') {
       data.recurrence = data.recurrence + ';COUNT=' + data.recurrence_count;
@@ -597,13 +597,14 @@ function atcb_decorate_data_recurring_events(data) {
   const startDate = data.dates?.[0].startDate || data.startDate;
   const startTime = data.dates?.[0].startTime || data.startTime;
   const startDateTime = (function () {
-    if (startTime) {
+    if (startTime && startTime !== '') {
       const offset = tzlib_get_offset(data.dates?.[0].timeZone || data.timeZone, startDate, startTime);
       return new Date(startDate + ' ' + startTime + ':00 GMT' + offset);
     }
     return new Date(startDate + 'T00:00:00Z');
   })();
-  const occurenceData = atcb_getNextOccurrence(data.recurrence, startDateTime);
+  const isAllDay = !(startTime && startTime !== '');
+  const occurenceData = atcb_getNextOccurrence(data.recurrence, startDateTime, isAllDay);
   if (!occurenceData || !occurenceData.nextOccurrence) {
     return data;
   }
@@ -909,7 +910,7 @@ function atcb_set_online_event_flag(data, i) {
   if (dateEntry.location && dateEntry.location.startsWith('http')) {
     dateEntry.onlineEvent = true;
   } else {
-    dateEntry.v = false;
+    dateEntry.onlineEvent = false;
   }
   return data;
 }
@@ -918,12 +919,12 @@ function atcb_replace_custom_variables(data, i) {
   const dateEntry = data.dates[`${i}`];
   for (const key in data.customVar) {
     const value = data.customVar[`${key}`];
-    dateEntry.name = atcb_replace_placeholder(dateEntry.name, value);
-    dateEntry.location = atcb_replace_placeholder(dateEntry.location, value);
+    dateEntry.name = atcb_replace_placeholder(dateEntry.name, key, value);
+    dateEntry.location = atcb_replace_placeholder(dateEntry.location, key, value);
   }
   return data;
 }
-function atcb_replace_placeholder(text, value) {
+function atcb_replace_placeholder(text, key, value) {
   const placeholder = '%%' + key.replace(/[^\w\-.]/g, '') + '%%';
   if (!text) return text;
   // eslint-disable-next-line security/detect-non-literal-regexp
@@ -1335,8 +1336,8 @@ async function atcb_validate_rrule_simplyfied(data, msgPrefix) {
   if (data.recurrence_interval && (data.recurrence_interval < 1 || data.recurrence_interval % 1 !== 0)) {
     throw new Error(msgPrefix + ' failed: recurrence data (interval) misspelled');
   }
-  if (data.recurrence_until && data.recurrence_until !== '' && !/^[\d\-:]+$/.test(data.recurrence_until)) {
-    throw new Error(msgPrefix + ' failed: recurrence data (until) misspelled');
+  if (data.recurrence_until && data.recurrence_until !== '' && !/^\d{8}T\d{6}Z$/.test(data.recurrence_until)) {
+    throw new Error(msgPrefix + ' failed: recurrence data (until) misspelled - must be in format YYYYMMDDTHHMMSSZ');
   }
   if (data.recurrence_count && (data.recurrence_count < 1 || data.recurrence_count % 1 !== 0)) {
     throw new Error(msgPrefix + ' failed: recurrence data (count) misspelled');
@@ -3810,7 +3811,6 @@ function atcb_translate_via_time_zone(date, time, baseTimeZone, targetTimeZone)
 }
 function atcb_generate_timestring(dates, language = 'en', subEvent = 'all', decorate = false, browserTimeOverride = false, enforceYear = false, hideTimeZone = false) {
   if (decorate) {
-    dates = atcb_decorate_data_recurrence({ dates: dates }).dates;
     dates = atcb_decorate_data_dates({ dates: dates }).dates;
   }
   let startDateInfo, endDateInfo, timeZoneInfoStart, timeZoneInfoEnd;
@@ -4312,12 +4312,18 @@ function matchesImplicitRules(date, rrule, startDate) {
   if (rrule.FREQ === 'YEARLY' && !rrule.BYMONTHDAY && !rrule.BYWEEKDAY && !rrule.BYYEARDAY && !rrule.BYWEEKNO && date.getUTCDate() !== startDate.getUTCDate()) return false;
   return true;
 }
-function atcb_getNextOccurrence(rruleStr, startDateTime) {
+function atcb_getNextOccurrence(rruleStr, startDateTime, allday) {
   const rrule = atcb_parseRRule(rruleStr);
+  if (allday && rrule.UNTIL instanceof Date) {
+    const untilEod = new Date(rrule.UNTIL);
+    untilEod.setUTCHours(23, 59, 59, 999);
+    rrule.UNTIL = untilEod;
+  }
   const now = new Date();
+  now.setUTCHours(0, 0, 0, 0);
   const stepMs = rrule.BYHOUR ? 60 * 60 * 1000 : 24 * 60 * 60 * 1000;
   let currentDate = startDateTime;
-  let occurrences = [];
+  const occurrences = [];
   let count = 0;
   let maxIterations = 10000;
   while (true) {
@@ -4325,19 +4331,18 @@ function atcb_getNextOccurrence(rruleStr, startDateTime) {
       occurrences.push(currentDate);
       count++;
       if (rrule.COUNT && count >= rrule.COUNT) break;
-      if (!rrule.COUNT && !rrule.UNTIL && occurrences.length > 0 && currentDate > now) break; 
+      if (!rrule.COUNT && !rrule.UNTIL && occurrences.length > 0 && (allday ? currentDate >= now : currentDate > now)) break;
     }
     if (rrule.UNTIL && currentDate > rrule.UNTIL) break;
     currentDate = new Date(currentDate.getTime() + stepMs);
     if (--maxIterations <= 0) {
-      console.log('Max iterations reached. Using what got calculated so far.');
       break;
     }
   }
   let nextDate = null;
   let countDate = 0;
-  for (let d of occurrences) {
-    if (d > now) {
+  for (const d of occurrences) {
+    if (allday ? d >= now : d > now) {
       nextDate = d;
       break;
     }
@@ -6093,10 +6098,18 @@ function atcb_global_listener_keydown(event) {
       if (event.key === 'ArrowDown' && currFocusOption.dataset.optionNumber < optionListCount) {
         targetFocus = parseInt(currFocusOption.dataset.optionNumber) + 1;
       } else if (event.key === 'Tab') {
-        if (currFocusOption.dataset.optionNumber < optionListCount) {
-          targetFocus = parseInt(currFocusOption.dataset.optionNumber) + 1;
+        if (event.shiftKey) {
+          if (currFocusOption.dataset.optionNumber > 1) {
+            targetFocus = parseInt(currFocusOption.dataset.optionNumber) - 1;
+          } else {
+            targetFocus = optionListCount;
+          }
         } else {
-          targetFocus = 1;
+          if (currFocusOption.dataset.optionNumber < optionListCount) {
+            targetFocus = parseInt(currFocusOption.dataset.optionNumber) + 1;
+          } else {
+            targetFocus = 1;
+          }
         }
       } else if (event.key === 'ArrowUp' && currFocusOption.dataset.optionNumber >= 1) {
         targetFocus = parseInt(currFocusOption.dataset.optionNumber) - 1;