add-to-calendar-button 2.6.12 → 2.6.13

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

@@ -5,7 +5,7 @@
  *
  * Style: 3D
  *
- * Version: 2.6.12
+ * Version: 2.6.13
  * 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.6.12
+ * Version: 2.6.13
  * 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.6.12
+ * Version: 2.6.13
  * 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.6.12
+ * Version: 2.6.13
  * 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.6.12
+ * Version: 2.6.13
  * 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.6.12
+ * Version: 2.6.13
  * 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.6.12
+ * Version: 2.6.13
  * 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

@@ -974,14 +974,14 @@ function tzlib_get_timezones(jsonType = false) {
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.6.12
+ *  Version: 2.6.13
  *  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.6.12';
+const atcbVersion = '2.6.13';
 const atcbCssTemplate = {};
 const atcbIsBrowser = () => {
   if (typeof window === 'undefined') {
@@ -992,7 +992,7 @@ const atcbIsBrowser = () => {
 };
 const atcbIsiOS = atcbIsBrowser()
   ? () => {
-      if ((/iPad|iPhone|iPod/i.test(navigator.userAgent || window.opera) && !window.MSStream) || (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1)) {
+      if (/iPad|iPhone|iPod/i.test(navigator.userAgent) && !/MSStream/i.test(navigator.userAgent)) {
         return true;
       } else {
         return false;
@@ -1003,7 +1003,7 @@ const atcbIsiOS = atcbIsBrowser()
     };
 const atcbIsAndroid = atcbIsBrowser()
   ? () => {
-      if (/android/i.test(navigator.userAgent || window.opera) && !window.MSStream) {
+      if (/android/i.test(navigator.userAgent) && !/MSStream/i.test(navigator.userAgent)) {
         return true;
       } else {
         return false;
@@ -1054,7 +1054,7 @@ const atcbIsWebView = atcbIsBrowser()
     };
 const atcbIsProblematicWebView = atcbIsBrowser()
   ? () => {
-      if (/(Instagram)/i.test(navigator.userAgent || window.opera)) {
+      if (/(Instagram)/i.test(navigator.userAgent)) {
         return true;
       } else {
         return false;
@@ -1350,12 +1350,15 @@ function atcb_decorate_data_options(data) {
     }
     if (
       ((atcbIsiOS() || data.fakeIOS) && atcbIOSInvalidOptions.includes(optionName)) ||
-      ((atcbIsAndroid() || data.fakeMobile || data.fakeAndroid) && atcbAndroidInvalidOptions.includes(optionName)) ||
+      ((atcbIsAndroid() || data.fakeAndroid) && atcbAndroidInvalidOptions.includes(optionName)) ||
       (data.recurrence && data.recurrence !== '' && (!atcbValidRecurrOptions.includes(optionName) || (data.recurrence_until && data.recurrence_until !== '' && (optionName === 'apple' || optionName === 'ical')) || ((atcbIsiOS() || data.fakeIOS) && optionName === 'google'))) ||
       (data.subscribe && atcbInvalidSubscribeOptions.includes(optionName))
     ) {
       continue;
     }
+    if ((atcbIsMobile() || data.fakeMobile) && data.subscribe && (optionName === 'ms365' || optionName === 'outlookcom')) {
+      continue;
+    }
     newOptions.push(optionName);
   }
   if (data.subscribe && data.icsFile && data.icsFile.startsWith('https://calendar.google.com/calendar/') && !data.icsFile.endsWith('.ics')) {
@@ -1370,7 +1373,7 @@ function atcb_decorate_data_options(data) {
   if ((atcbIsiOS() || data.fakeIOS) && iCalGiven && !appleGiven) {
     newOptions.push('apple');
   }
-  if ((atcbIsAndroid() || data.fakeMobile || data.fakeAndroid) && appleGiven && !iCalGiven) {
+  if ((atcbIsAndroid() || data.fakeAndroid) && appleGiven && !iCalGiven) {
     newOptions.push('ical');
   }
   data.options = newOptions;
@@ -1670,7 +1673,7 @@ function atcb_decorate_data_button_status_handling(data) {
   if (!data.pastDateHandling || (data.pastDateHandling != 'disable' && data.pastDateHandling != 'hide')) {
     data.pastDateHandling = 'none';
   }
-  const overdue = (function () {
+  data.allOverdue = (function () {
     for (let i = 0; i < data.dates.length; i++) {
       if (!data.dates[`${i}`].overdue) {
         return false;
@@ -1678,15 +1681,21 @@ function atcb_decorate_data_button_status_handling(data) {
     }
     return true;
   })();
-  data.allOverdue = false;
-  if (overdue) {
-    data.allOverdue = true;
+  if (data.allOverdue) {
     if (data.pastDateHandling == 'disable') {
       data.disabled = true;
     } else if (data.pastDateHandling == 'hide') {
       data.hidden = true;
     }
   }
+  data.allCancelled = (function () {
+    for (let i = 0; i < data.dates.length; i++) {
+      if (!data.dates[`${i}`].status || data.dates[`${i}`].status.toLowerCase() !== 'cancelled') {
+        return false;
+      }
+    }
+    return true;
+  })();
   if (data.disabled || data.hidden) {
     data.blockInteraction = true;
   }
@@ -1855,7 +1864,8 @@ async function atcb_validate_date_blocks(data, msgPrefix) {
   }
 }
 async function atcb_validate_status(data, msgPrefix, i, msgSuffix) {
-  if (data.dates[`${i}`].status !== 'TENTATIVE' && data.dates[`${i}`].status !== 'CONFIRMED' && data.dates[`${i}`].status !== 'CANCELLED') {
+  const allowedStatuses = ['tentative', 'confirmed', 'cancelled'];
+  if (!allowedStatuses.includes(data.dates[`${i}`].status.toLowerCase())) {
     throw new Error(msgPrefix + ' failed: event status needs to be TENTATIVE, CONFIRMED, or CANCELLED' + msgSuffix);
   }
   return true;
@@ -2100,7 +2110,7 @@ function atcb_close(host, keyboardTrigger = false) {
   if (allModals.length > 1) {
     existingModalHost.shadowRoot.querySelectorAll('.atcb-modal[data-modal-nr="' + allModals.length + '"]')[0].remove();
     const nextModal = existingModalHost.shadowRoot.querySelectorAll('.atcb-modal[data-modal-nr="' + (allModals.length - 1) + '"]')[0];
-    nextModal.style.display = 'block';
+    nextModal.classList.remove('atcb-hidden');
     let focusEl = nextModal;
     const availableButtons = nextModal.getElementsByTagName('button');
     if (availableButtons.length > 0) {
@@ -2366,7 +2376,7 @@ function atcb_generate_button(host, button, data) {
       buttonDropdownAnchor.classList.add('atcb-dropdown-anchor');
       buttonTrigger.append(buttonDropdownAnchor);
     }
-    if (!data.hideCheckmark && !data.hideTextLabelButton && !data.buttonsList && !data.disabled) {
+    if (!data.hideCheckmark && !data.hideTextLabelButton && !data.buttonsList && !data.disabled && !data.allCancelled) {
       const btnCheck = document.createElement('div');
       btnCheck.classList.add('atcb-checkmark');
       btnCheck.innerHTML = atcbIcon['checkmark'];
@@ -2676,6 +2686,7 @@ async function atcb_create_modal(mainHost, data, icon = '', headline, content =
     prevModal.classList.add('atcb-hidden');
   }
   atcb_manage_body_scroll(modalHost, modalWrapper);
+  return;
 }
 function atcb_subscribe_yahoo_modal_switch(host, data, keyboardTrigger) {
   atcb_set_fully_successful(host, data);
@@ -2689,11 +2700,11 @@ function atcb_generate_date_button(data, parent, subEvent = 'all', oneOption = f
   }
   const fullTimeInfo = atcb_generate_timestring(data.dates, data.language, subEvent);
   const hoverText = (function () {
-    if (subEvent != 'all' && data.dates[`${subEvent}`].status == 'CANCELLED') {
+    if ((subEvent !== 'all' && data.dates[`${subEvent}`].status.toLowerCase() === 'cancelled') || (subEvent === 'all' && data.allCancelled)) {
       return atcb_translate_hook('date.status.cancelled', data) + '<br>' + atcb_translate_hook('date.status.cancelled.cta', data);
     }
     if (data.pastDateHandling != 'none') {
-      if ((subEvent == 'all' && data.allOverdue) || (subEvent != 'all' && data.dates[`${subEvent}`].overdue)) {
+      if ((subEvent === 'all' && data.allOverdue) || (subEvent != 'all' && data.dates[`${subEvent}`].overdue)) {
         return atcb_translate_hook('expired', data);
       }
     }
@@ -2703,7 +2714,7 @@ function atcb_generate_date_button(data, parent, subEvent = 'all', oneOption = f
     return '+ ' + atcb_translate_hook('label.addtocalendar', data);
   })();
   const cancelledInfo = (function () {
-    if (subEvent != 'all' && data.dates[`${subEvent}`].status == 'CANCELLED') {
+    if ((subEvent !== 'all' && data.dates[`${subEvent}`].status.toLowerCase() === 'cancelled') || (subEvent === 'all' && data.allCancelled)) {
       return atcb_translate_hook('date.status.cancelled', data);
     }
     return '';
@@ -2818,7 +2829,7 @@ function atcb_generate_date_button(data, parent, subEvent = 'all', oneOption = f
   btnHover.classList.add('atcb-date-btn-hover');
   btnHover.innerHTML = hoverText;
   btnRight.append(btnHover);
-  if (!data.hideCheckmark) {
+  if (!data.hideCheckmark && data.dates[`${subEvent}`].status.toLowerCase() !== 'cancelled') {
     const btnCheck = document.createElement('div');
     btnCheck.classList.add('atcb-checkmark');
     btnCheck.innerHTML = atcbIcon['checkmark'];
@@ -2836,10 +2847,10 @@ function atcb_generate_date_button(data, parent, subEvent = 'all', oneOption = f
 }
 async function atcb_generate_modal_host(host, data, reset = true) {
   const existingModalHost = document.getElementById(data.identifier + '-modal-host');
-  if (!reset && existingModalHost) {
-    return existingModalHost.shadowRoot;
-  }
   if (existingModalHost) {
+    if (!reset) {
+      return existingModalHost.shadowRoot;
+    }
     existingModalHost.remove();
   }
   let newModalHost = document.createElement('div');
@@ -2906,7 +2917,7 @@ function atcb_generate_rich_data(data, parent) {
     if (data.dates.length > 1) {
       schemaContent.push('"@id":"' + id + '-' + (i + 1) + '"');
     }
-    if (data.dates[`${i}`].status === 'CANCELLED') {
+    if (data.dates[`${i}`].status.toLowerCase() === 'cancelled') {
       schemaContent.push('"eventStatus":"https://schema.org/EventCancelled"');
     } else {
       schemaContent.push('"eventStatus":"https://schema.org/EventScheduled"');
@@ -3023,7 +3034,7 @@ function atcb_generate_links(host, type, data, subEvent = 'all', keyboardTrigger
     return;
   }
   if (subEvent !== 'all') {
-    if (data.dates[`${subEvent}`].status === 'CANCELLED' && linkType !== 'ical') {
+    if (data.dates[`${subEvent}`].status.toLowerCase() === 'cancelled' && linkType !== 'ical') {
       atcb_create_modal(host, data, 'warning', atcb_translate_hook('date.status.cancelled', data), atcb_translate_hook('date.status.cancelled.cta', data), [], [], keyboardTrigger);
     } else {
       if (!skipDoubleLink) {
@@ -3048,20 +3059,20 @@ function atcb_generate_links(host, type, data, subEvent = 'all', keyboardTrigger
           atcb_generate_yahoo(data, data.dates[`${subEvent}`], subEvent);
           break;
       }
-    }
-    const modalHost = document.getElementById(data.identifier + '-modal-host');
-    if (modalHost) {
-      const subEventButton = modalHost.shadowRoot.getElementById(data.identifier + '-' + type + '-' + (subEvent + 1));
-      if (subEventButton) {
-        subEventButton.classList.add('atcb-saved');
+      const modalHost = document.getElementById(data.identifier + '-modal-host');
+      if (modalHost) {
+        const subEventButton = modalHost.shadowRoot.getElementById(data.identifier + '-' + type + '-' + (subEvent + 1));
+        if (subEventButton) {
+          subEventButton.classList.add('atcb-saved');
+        }
+      }
+      if (data.dates[`${subEvent}`].status.toLowerCase() !== 'cancelled') atcbStates[`${data.identifier}`][`${type}`][`${subEvent}`]++;
+      const filteredStates = atcbStates[`${data.identifier}`][`${type}`].filter(function (value) {
+        return value < 1;
+      });
+      if (filteredStates.length == 0) {
+        atcb_set_fully_successful(host, data, multiDateModal);
       }
-    }
-    atcbStates[`${data.identifier}`][`${type}`][`${subEvent}`]++;
-    const filteredStates = atcbStates[`${data.identifier}`][`${type}`].filter(function (value) {
-      return value < 1;
-    });
-    if (filteredStates.length == 0) {
-      atcb_set_fully_successful(host, data, multiDateModal);
     }
     return;
   }
@@ -3071,7 +3082,7 @@ function atcb_generate_multidate_links(host, type, linkType, data, keyboardTrigg
   if (
     linkType === 'ical' &&
     data.dates.every(function (theSubEvent) {
-      if (theSubEvent.status == 'CANCELLED' || (theSubEvent.organizer != null && theSubEvent.organizer != '')) {
+      if (theSubEvent.status.toLowerCase() == 'cancelled' || (theSubEvent.organizer != null && theSubEvent.organizer != '')) {
         return false;
       }
       return true;
@@ -3096,7 +3107,7 @@ function atcb_generate_subscribe_links(host, linkType, data, keyboardTrigger) {
   const adjustedFileUrl = data.icsFile.replace('https://', 'webcal://');
   switch (linkType) {
     case 'ical': // also for apple (see above)
-      if (atcbIsAndroid() || data.fakeMobile || data.fakeAndroid) {
+      if (atcbIsAndroid() || data.fakeAndroid) {
         atcb_subscribe_ical(data, data.icsFile);
         break;
       }
@@ -3182,7 +3193,7 @@ function atcb_subscribe_google(data, fileUrl) {
     }
     return encodeURIComponent(fileUrl);
   })();
-  if (atcbIsAndroid() || data.fakeMobile || data.fakeAndroid) {
+  if (atcbIsAndroid() || data.fakeAndroid) {
     atcb_open_cal_url(data, 'google', 'intent://' + baseUrlApp + newFileUrl + '#Intent;scheme=https;package=com.google.android.calendar;end', true);
     return;
   }
@@ -3359,7 +3370,7 @@ function atcb_open_cal_url(data, type, url, subscribe = false, subEvent = null,
   }
 }
 function atcb_generate_ical(host, data, subEvent = 'all', keyboardTrigger = false) {
-  if (subEvent != 'all') {
+  if (subEvent !== 'all') {
     subEvent = parseInt(subEvent);
   }
   const filename = atcb_determine_ical_filename(data, subEvent);
@@ -3369,10 +3380,10 @@ function atcb_generate_ical(host, data, subEvent = 'all', keyboardTrigger = fals
     if ((data.attendee && data.attendee !== '' && potentialHostAttendee !== '') || (data.customVar && data.customVar !== '' && potentialHostCustomVar !== '')) {
       return '';
     }
-    if (subEvent != 'all' && data.dates[`${subEvent}`].icsFile != null && data.dates[`${subEvent}`].icsFile != '') {
+    if (subEvent !== 'all' && data.dates[`${subEvent}`].icsFile && data.dates[`${subEvent}`].icsFile !== '') {
       return data.dates[`${subEvent}`].icsFile;
     }
-    if (data.icsFile != null && data.icsFile != '') {
+    if (data.icsFile && data.icsFile !== '') {
       return data.icsFile;
     }
     return '';
@@ -3392,10 +3403,10 @@ function atcb_generate_ical(host, data, subEvent = 'all', keyboardTrigger = fals
   if (subEvent == 'all') {
     ics_lines.push('METHOD:PUBLISH');
   } else {
-    if (data.dates[`${subEvent}`].status != null && data.dates[`${subEvent}`].status == 'CANCELLED') {
+    if (data.dates[`${subEvent}`].status && data.dates[`${subEvent}`].status.toLowerCase() === 'cancelled') {
       ics_lines.push('METHOD:CANCEL');
     } else {
-      if (data.dates[`${subEvent}`].organizer != null && data.dates[`${subEvent}`].organizer != '') {
+      if (data.dates[`${subEvent}`].organizer && data.dates[`${subEvent}`].organizer != '') {
         ics_lines.push('METHOD:REQUEST');
       } else {
         ics_lines.push('METHOD:PUBLISH');
@@ -5551,7 +5562,11 @@ function atcb_setup_state_management(data) {
   for (let i = 0; i < data.options.length; i++) {
     singleDates[data.options[`${i}`]] = [];
     for (let id = 1; id <= data.dates.length; id++) {
-      singleDates[data.options[`${i}`]].push(0);
+      if (data.dates[id - 1].status.toLowerCase() === 'cancelled') {
+        singleDates[data.options[`${i}`]].push(1);
+      } else {
+        singleDates[data.options[`${i}`]].push(0);
+      }
     }
   }
   atcbStates[data.identifier] = singleDates;