add-to-calendar-button 2.10.0 → 2.11.0

package/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Version 2
 
+- v2.11 : ⚠️ Breaking: When setting the dates objects and respective attributes on the root level, root values always override the dates object (except for name in the multi-date case)
 - v2.10 : Hungarian language, no more X cursor, no different button icons for oneOption cases, create 1 ics file if organizer is the same, subtle style updates, allow to override automatic option-cleanup on mobile via mobile Options
 - v2.9 : New style "simple", better ical generation
 - v2.8 : Ukranian language

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

@@ -5,7 +5,7 @@
  *
  * Style: 3D
  *
- * Version: 2.10.0
+ * Version: 2.11.0
  * 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.10.0
+ * Version: 2.11.0
  * 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.10.0
+ * Version: 2.11.0
  * 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.10.0
+ * Version: 2.11.0
  * 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.10.0
+ * Version: 2.11.0
  * 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.10.0
+ * Version: 2.11.0
  * 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.10.0
+ * Version: 2.11.0
  * 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.10.0
+ * Version: 2.11.0
  * 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.10.0
+ *  Version: 2.11.0
  *  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.10.0';
+const atcbVersion = '2.11.0';
 const atcbCssTemplate = {};
 const atcbIsBrowser = () => {
   if (typeof window === 'undefined') {
@@ -487,7 +487,7 @@ const atcbIcon = {
 
 async function atcb_decorate_data(data) {
   data = atcb_decorate_data_boolean(data);
-  data.timeZone = atcb_decorate_data_timezone(data.timeZone);
+  data = atcb_decorate_data_defaults(data);
   data = atcb_decorate_data_rrule(data);
   data = atcb_decorate_data_options(data);
   data = atcb_decorate_data_style(data);
@@ -495,8 +495,6 @@ async function atcb_decorate_data(data) {
   data.lightMode = atcb_decorate_light_mode(data.lightMode);
   data = atcb_decorate_data_i18n(data);
   data = atcb_decorate_data_dates(data);
-  data = atcb_decorate_data_meta(data);
-  data = atcb_decorate_data_extend(data);
   data = atcb_decorate_data_button_status_handling(data);
   data = await atcb_decorate_data_rsvp(data);
   return data;
@@ -515,11 +513,20 @@ function atcb_decorate_data_boolean(data) {
   }
   return data;
 }
-function atcb_decorate_data_timezone(tz = null) {
-  if (!tz || tz === '') {
-    return 'GMT';
+function atcb_decorate_data_defaults(data) {
+  if (!data.timeZone || data.timeZone === '') {
+    data.timeZone = 'GMT';
   }
-  return tz;
+  if (!data.status || data.status === '') {
+    data.status = 'CONFIRMED';
+  }
+  if (!data.sequence || data.sequence === '') {
+    data.sequence = 0;
+  }
+  if (!data.language || data.language === '' || !availableLanguages.includes(data.language)) {
+    data.language = 'en';
+  }
+  return data;
 }
 function atcb_decorate_data_rrule(data) {
   if (data.recurrence && data.recurrence !== '') {
@@ -725,9 +732,6 @@ function atcb_decorate_light_mode(lightMode = '') {
   return lightMode;
 }
 function atcb_decorate_data_i18n(data) {
-  if (!data.language || data.language === '' || !availableLanguages.includes(data.language)) {
-    data.language = 'en';
-  }
   if (data.language.length > 2) {
     data.language = data.language.substring(0, 2);
   }
@@ -739,38 +743,20 @@ function atcb_decorate_data_i18n(data) {
   return data;
 }
 function atcb_decorate_data_dates(data) {
-  if (data.dates && data.dates.length > 0) {
-    for (let i = 0; i < data.dates.length; i++) {
-      if (!data.dates[`${i}`].timeZone && data.timeZone) {
-        data.dates[`${i}`].timeZone = data.timeZone;
-      }
-      if (!data.dates[`${i}`].useUserTZ && data.useUserTZ) {
-        data.dates[`${i}`].useUserTZ = data.useUserTZ;
-      }
-      const cleanedUpDates = atcb_date_cleanup(data.dates[`${i}`]);
-      data.dates[`${i}`].startDate = cleanedUpDates.startDate;
-      data.dates[`${i}`].endDate = cleanedUpDates.endDate;
-      data.dates[`${i}`].startTime = cleanedUpDates.startTime;
-      data.dates[`${i}`].endTime = cleanedUpDates.endTime;
-      data.dates[`${i}`].timeZone = cleanedUpDates.timeZone;
-      data.dates[`${i}`].timestamp = atcb_date_specials_calculation('timestamp', data.dates[`${i}`].startDate, data.dates[`${i}`].startTime, data.dates[`${i}`].timeZone);
-      data.dates[`${i}`].overdue = atcb_date_specials_calculation('overdue', data.dates[`${i}`].endDate, data.dates[`${i}`].endTime, data.dates[`${i}`].timeZone);
-    }
-  } else {
-    data.dates = [];
-    data.dates[0] = new Object();
-    if (data.useUserTZ) data.dates[0].useUserTZ = data.useUserTZ;
-    const cleanedUpDates = atcb_date_cleanup(data);
-    data.startDate = data.dates[0].startDate = cleanedUpDates.startDate;
-    data.endDate = data.dates[0].endDate = cleanedUpDates.endDate;
-    data.startTime = data.dates[0].startTime = cleanedUpDates.startTime;
-    data.endTime = data.dates[0].endTime = cleanedUpDates.endTime;
-    data.timeZone = data.dates[0].timeZone = cleanedUpDates.timeZone;
-    if (!data.recurrence) {
-      data.dates[0].overdue = atcb_date_specials_calculation('overdue', data.endDate, data.endTime, data.timeZone);
-    } else {
-      data.dates[0].overdue = false;
-    }
+  if (!data.dates || !Array.isArray(data.dates)) {
+    data.dates = [{ name: data.name }];
+  }
+  if (data.recurrence && data.recurrence !== '') {
+    data.dates[0].recurrence = data.recurrence;
+  }
+  for (let i = 0; i < data.dates.length; i++) {
+    data = atcb_move_root_values_into_dates(data, i);
+    data = atcb_dates_cleanup(data, i);
+    data = atcb_generate_unique_uid(data, i);
+    data = atcb_transform_strings(data, i);
+    data = atcb_decorate_data_description(data, i);
+    data = atcb_replace_custom_variables(data, i);
+    data = atcb_set_online_event_flag(data, i);
   }
   const now = new Date();
   if (!data.created || data.created === '') {
@@ -779,29 +765,60 @@ function atcb_decorate_data_dates(data) {
   if (!data.updated || data.updated === '') {
     data.updated = atcb_format_datetime(now, 'clean', true);
   }
+  if (data.dates.length > 1) {
+    data.dates.sort((a, b) => a.timestamp - b.timestamp);
+  }
   return data;
 }
-function atcb_decorate_data_meta(data) {
-  if (!data.status || data.status === '') {
-    data.status = 'CONFIRMED';
+function atcb_move_root_values_into_dates(data, i) {
+  const dateEntry = data.dates[`${i}`];
+  const properties = ['description', 'startDate', 'startTime', 'endDate', 'endTime', 'timeZone', 'useUserTZ', 'location', 'status', 'sequence', 'availability', 'organizer', 'attendee'];
+  if (data.dates.length === 1) {
+    properties.unshift('name');
   }
-  if (!data.sequence || data.sequence === '') {
-    data.sequence = 0;
+  properties.forEach((prop) => {
+    if (data[`${prop}`] && data[`${prop}`] !== '') {
+      dateEntry[`${prop}`] = data[`${prop}`];
+    }
+  });
+  return data;
+}
+function atcb_dates_cleanup(data, i) {
+  const dateEntry = data.dates[`${i}`];
+  const cleanedUpDates = atcb_date_cleanup(dateEntry);
+  dateEntry.startDate = cleanedUpDates.startDate;
+  dateEntry.endDate = cleanedUpDates.endDate;
+  dateEntry.startTime = cleanedUpDates.startTime;
+  dateEntry.endTime = cleanedUpDates.endTime;
+  dateEntry.timeZone = cleanedUpDates.timeZone;
+  dateEntry.timestamp = atcb_date_specials_calculation('timestamp', dateEntry.startDate, dateEntry.startTime, dateEntry.timeZone);
+  dateEntry.overdue = atcb_date_specials_calculation('overdue', dateEntry.endDate, dateEntry.endTime, dateEntry.timeZone);
+  return data;
+}
+function atcb_generate_unique_uid(data, i) {
+  const dateEntry = data.dates[`${i}`];
+  if (!dateEntry.uid) {
+    if (i === 0 && data.uid && data.uid !== '') {
+      dateEntry.uid = data.uid;
+    } else if (data.uid && data.uid !== '') {
+      dateEntry.uid = `${data.uid}-${i + 1}`;
+    } else {
+      dateEntry.uid = atcb_generate_uuid();
+    }
   }
   return data;
 }
+function atcb_transform_strings(data, i) {
+  const dateEntry = data.dates[`${i}`];
+  dateEntry.status = atcb_apply_transformation(dateEntry.status, 'upper');
+  dateEntry.availability = atcb_apply_transformation(dateEntry.availability, 'lower');
+  return data;
+}
 function atcb_decorate_data_description(data, i) {
   const cleanDescription = (desc) => desc.replace(/(\\r\\n|\\n|\\r|<br(\s*\/?)>)/g, '');
-  let description = data.dates[`${i}`].description || data.description || '';
+  let description = data.dates[`${i}`].description;
   if (description) {
     description = cleanDescription(description);
-    if (data.customVar) {
-      for (const key in data.customVar) {
-        const sanitizedKey = '%%' + key.replace(/[^\w\-.]/g, '') + '%%';
-        // eslint-disable-next-line security/detect-non-literal-regexp
-        description = description.replace(new RegExp(sanitizedKey, 'gi'), data.customVar[`${key}`]);
-      }
-    }
     const descriptionHtmlFree = atcb_rewrite_html_elements(description, true);
     const descriptionHtmlFreeICal = atcb_rewrite_html_elements(description, true, true);
     description = atcb_rewrite_html_elements(description);
@@ -811,78 +828,18 @@ function atcb_decorate_data_description(data, i) {
   }
   return data;
 }
-function atcb_decorate_data_extend(data) {
-  for (let i = 0; i < data.dates.length; i++) {
-    data = atcb_decorate_data_description(data, i);
-    data = atcb_extend_date_with_global_values(data, i);
-    data = atcb_set_online_event_flag(data, i);
-    data = atcb_generate_unique_uid(data, i);
-    data = atcb_replace_custom_variables(data, i);
-  }
-  if (data.recurrence && data.recurrence !== '') {
-    data.dates[0].recurrence = data.recurrence;
-  }
-  if (data.dates.length > 1) {
-    data.dates.sort((a, b) => a.timestamp - b.timestamp);
-  }
-  return data;
-}
-function atcb_extend_date_with_global_values(data, dateIndex) {
-  const dateEntry = data.dates[`${dateIndex}`];
-  atcb_copy_global_to_date_entry(dateEntry, 'name', data.name, { allowEmpty: true });
-  atcb_copy_global_to_date_entry(dateEntry, 'status', data.status, { transform: 'upper', applyTransformAlways: true });
-  atcb_copy_global_to_date_entry(dateEntry, 'sequence', data.sequence);
-  atcb_copy_global_to_date_entry(dateEntry, 'organizer', data.organizer);
-  atcb_copy_global_to_date_entry(dateEntry, 'attendee', data.attendee);
-  atcb_copy_global_to_date_entry(dateEntry, 'availability', data.availability, { transform: 'lower', applyTransformAlways: true });
-  atcb_copy_global_to_date_entry(dateEntry, 'location', data.location);
-  return data;
-}
-function atcb_copy_global_to_date_entry(dateEntry, property, globalValue, options = {}) {
-  const { allowEmpty = false, transform = null, applyTransformAlways = false } = options;
-  const shouldCopy = allowEmpty ? (!dateEntry[`${property}`] || dateEntry[`${property}`] === '') && globalValue !== undefined : !dateEntry[`${property}`] && globalValue;
-  if (shouldCopy) {
-    dateEntry[`${property}`] = atcb_apply_transformation(globalValue, transform);
-  } else if (applyTransformAlways && dateEntry[`${property}`]) {
-    dateEntry[`${property}`] = atcb_apply_transformation(dateEntry[`${property}`], transform);
-  }
-}
-function atcb_apply_transformation(value, transform) {
-  if (!transform || !value) return value;
-  switch (transform) {
-    case 'upper':
-      return value.toString().toUpperCase();
-    case 'lower':
-      return value.toString().toLowerCase();
-    default:
-      return value;
-  }
-}
-function atcb_set_online_event_flag(data, dateIndex) {
-  const dateEntry = data.dates[`${dateIndex}`];
+function atcb_set_online_event_flag(data, i) {
+  const dateEntry = data.dates[`${i}`];
   if (dateEntry.location && dateEntry.location.startsWith('http')) {
     dateEntry.onlineEvent = true;
   } else {
-    dateEntry.onlineEvent = false;
+    dateEntry.v = false;
   }
   return data;
 }
-function atcb_generate_unique_uid(data, dateIndex) {
-  const dateEntry = data.dates[`${dateIndex}`];
-  if (!dateEntry.uid) {
-    if (dateIndex === 0 && data.uid && data.uid !== '') {
-      dateEntry.uid = data.uid;
-    } else if (data.uid && data.uid !== '') {
-      dateEntry.uid = `${data.uid}-${dateIndex + 1}`;
-    } else {
-      dateEntry.uid = atcb_generate_uuid();
-    }
-  }
-  return data;
-}
-function atcb_replace_custom_variables(data, dateIndex) {
+function atcb_replace_custom_variables(data, i) {
   if (!data.customVar) return data;
-  const dateEntry = data.dates[`${dateIndex}`];
+  const dateEntry = data.dates[`${i}`];
   for (const key in data.customVar) {
     const value = data.customVar[`${key}`];
     dateEntry.name = atcb_replace_placeholder(dateEntry.name, value);
@@ -3032,8 +2989,7 @@ 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) {
-    const tmpRootTZ = atcb_decorate_data_timezone();
-    dates = atcb_decorate_data_dates({ dates: dates, timeZone: tmpRootTZ }).dates;
+    dates = atcb_decorate_data_dates({ dates: dates }).dates;
   }
   let startDateInfo, endDateInfo, timeZoneInfoStart, timeZoneInfoEnd;
   let formattedTimeStart = {};
@@ -3442,6 +3398,17 @@ function atcb_generate_uuid() {
   const id = ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, (c) => (c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))).toString(16));
   return id;
 }
+function atcb_apply_transformation(value, transform) {
+  if (!transform || !value) return value;
+  switch (transform) {
+    case 'upper':
+      return value.toString().toUpperCase();
+    case 'lower':
+      return value.toString().toLowerCase();
+    default:
+      return value;
+  }
+}
 function atcb_copy_to_clipboard(dataString) {
   const tmpInput = document.createElement('input');
   document.body.append(tmpInput);
@@ -5082,7 +5049,7 @@ async function atcb_get_pro_data(licenseKey, el = null, directData = {}) {
         if (proOverride) {
           const hostname = window?.location.hostname || '';
           atcbWcParams.forEach((key) => {
-            if ((Object.prototype.hasOwnProperty.call(dataOverrides, key) && ['hideBranding', 'hidebranding', 'ty', 'rsvp'].indexOf(key) === -1) || hostname === 'caldn.net') {
+            if ((Object.prototype.hasOwnProperty.call(dataOverrides, key) && ['hideBranding', 'ty', 'rsvp'].indexOf(key) === -1) || hostname === 'caldn.net') {
               data[`${key}`] = dataOverrides[`${key}`];
             }
           });