Skip to content

Commit d3ec6b3

Browse files
jekuerjekuer
authored
Merge pull request #693 from add2cal/dev
Dev
2 parents dfc02d0 + 625946b commit d3ec6b3

30 files changed

+47
-72
lines changed

‎assets/css/atcb-3d.css

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Style: 3D
77
*
8-
* Version: 2.8.8
8+
* Version: 2.8.9
99
* Creator: Jens Kuerschner (https://jekuer.com)
1010
* Project: https://github.com/add2cal/add-to-calendar-button
1111
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
@@ -831,7 +831,6 @@ a.atcb-modal-btn:not([disabled]):hover {
831831
display: -webkit-box;
832832
-webkit-line-clamp: var(--date-btn-headline-line-clamp);
833833
line-clamp: var(--date-btn-headline-line-clamp);
834-
-webkit-box-orient: vertical;
835834
}
836835

837836
.atcb-date-btn-content {
@@ -851,7 +850,6 @@ a.atcb-modal-btn:not([disabled]):hover {
851850
display: -webkit-box;
852851
-webkit-line-clamp: 1;
853852
line-clamp: 1;
854-
-webkit-box-orient: vertical;
855853
word-break: break-all;
856854
}
857855

‎assets/css/atcb-3d.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/atcb-date.css

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Style: Date
77
*
8-
* Version: 2.8.8
8+
* Version: 2.8.9
99
* Creator: Jens Kuerschner (https://jekuer.com)
1010
* Project: https://github.com/add2cal/add-to-calendar-button
1111
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
@@ -340,7 +340,6 @@
340340
display: -webkit-box;
341341
-webkit-line-clamp: var(--date-btn-headline-line-clamp);
342342
line-clamp: var(--date-btn-headline-line-clamp);
343-
-webkit-box-orient: vertical;
344343
}
345344

346345
.atcb-date-btn-content {
@@ -360,7 +359,6 @@
360359
display: -webkit-box;
361360
-webkit-line-clamp: 1;
362361
line-clamp: 1;
363-
-webkit-box-orient: vertical;
364362
word-break: break-all;
365363
}
366364

‎assets/css/atcb-date.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/atcb-flat.css

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Style: Flat
77
*
8-
* Version: 2.8.8
8+
* Version: 2.8.9
99
* Creator: Jens Kuerschner (https://jekuer.com)
1010
* Project: https://github.com/add2cal/add-to-calendar-button
1111
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
@@ -763,7 +763,6 @@ a.atcb-modal-btn:not([disabled]):hover {
763763
display: -webkit-box;
764764
-webkit-line-clamp: var(--date-btn-headline-line-clamp);
765765
line-clamp: var(--date-btn-headline-line-clamp);
766-
-webkit-box-orient: vertical;
767766
}
768767

769768
.atcb-date-btn-content {
@@ -783,7 +782,6 @@ a.atcb-modal-btn:not([disabled]):hover {
783782
display: -webkit-box;
784783
-webkit-line-clamp: 1;
785784
line-clamp: 1;
786-
-webkit-box-orient: vertical;
787785
word-break: break-all;
788786
}
789787

‎assets/css/atcb-flat.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/atcb-neumorphism.css

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Style: Neumorphism
77
*
8-
* Version: 2.8.8
8+
* Version: 2.8.9
99
* Creator: Jens Kuerschner (https://jekuer.com)
1010
* Project: https://github.com/add2cal/add-to-calendar-button
1111
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
@@ -740,7 +740,6 @@ a.atcb-modal-btn:not([disabled]):hover {
740740
display: -webkit-box;
741741
-webkit-line-clamp: var(--date-btn-headline-line-clamp);
742742
line-clamp: var(--date-btn-headline-line-clamp);
743-
-webkit-box-orient: vertical;
744743
}
745744

746745
.atcb-date-btn-content {
@@ -760,7 +759,6 @@ a.atcb-modal-btn:not([disabled]):hover {
760759
display: -webkit-box;
761760
-webkit-line-clamp: 1;
762761
line-clamp: 1;
763-
-webkit-box-orient: vertical;
764762
word-break: break-all;
765763
}
766764

‎assets/css/atcb-neumorphism.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/atcb-round.css

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Style: Round
77
*
8-
* Version: 2.8.8
8+
* Version: 2.8.9
99
* Creator: Jens Kuerschner (https://jekuer.com)
1010
* Project: https://github.com/add2cal/add-to-calendar-button
1111
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
@@ -834,7 +834,6 @@ a.atcb-modal-btn:not([disabled]):hover {
834834
display: -webkit-box;
835835
-webkit-line-clamp: var(--date-btn-headline-line-clamp);
836836
line-clamp: var(--date-btn-headline-line-clamp);
837-
-webkit-box-orient: vertical;
838837
}
839838

840839
.atcb-date-btn-content {
@@ -854,7 +853,6 @@ a.atcb-modal-btn:not([disabled]):hover {
854853
display: -webkit-box;
855854
-webkit-line-clamp: 1;
856855
line-clamp: 1;
857-
-webkit-box-orient: vertical;
858856
word-break: break-all;
859857
}
860858

‎assets/css/atcb-round.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/atcb-text.css

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Style: Text
77
*
8-
* Version: 2.8.8
8+
* Version: 2.8.9
99
* Creator: Jens Kuerschner (https://jekuer.com)
1010
* Project: https://github.com/add2cal/add-to-calendar-button
1111
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
@@ -843,7 +843,6 @@ a.atcb-modal-btn:not([disabled]):hover {
843843
display: -webkit-box;
844844
-webkit-line-clamp: var(--date-btn-headline-line-clamp);
845845
line-clamp: var(--date-btn-headline-line-clamp);
846-
-webkit-box-orient: vertical;
847846
}
848847

849848
.atcb-date-btn-content {
@@ -863,7 +862,6 @@ a.atcb-modal-btn:not([disabled]):hover {
863862
display: -webkit-box;
864863
-webkit-line-clamp: 1;
865864
line-clamp: 1;
866-
-webkit-box-orient: vertical;
867865
word-break: break-all;
868866
}
869867

‎assets/css/atcb-text.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/atcb.css

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Style: Default
77
*
8-
* Version: 2.8.8
8+
* Version: 2.8.9
99
* Creator: Jens Kuerschner (https://jekuer.com)
1010
* Project: https://github.com/add2cal/add-to-calendar-button
1111
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
@@ -769,7 +769,6 @@ a.atcb-modal-btn:not([disabled]):hover {
769769
display: -webkit-box;
770770
-webkit-line-clamp: var(--date-btn-headline-line-clamp);
771771
line-clamp: var(--date-btn-headline-line-clamp);
772-
-webkit-box-orient: vertical;
773772
}
774773

775774
.atcb-date-btn-content {
@@ -789,7 +788,6 @@ a.atcb-modal-btn:not([disabled]):hover {
789788
display: -webkit-box;
790789
-webkit-line-clamp: 1;
791790
line-clamp: 1;
792-
-webkit-box-orient: vertical;
793791
word-break: break-all;
794792
}
795793

‎assets/css/atcb.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/components/footer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ function topFunction() {
7070
</span>
7171
<div class="mt-6 text-xs sm:mt-5 md:mt-3">
7272
<span class="font-semibold text-zinc-500 dark:text-zinc-400"> &copy; {{new Date().getFullYear()}} </span>
73-
<span class="lowercase text-zinc-400 dark:text-zinc-500"> , Current Version: 2.8.8 </span>
73+
<span class="lowercase text-zinc-400 dark:text-zinc-500"> , Current Version: 2.8.9 </span>
7474
</div>
7575
</div>
7676
<div class="hidden self-center sm:block">

‎demo/public/atcb.css

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* Style: Default
77
*
8-
* Version: 2.8.8
8+
* Version: 2.8.9
99
* Creator: Jens Kuerschner (https://jekuer.com)
1010
* Project: https://github.com/add2cal/add-to-calendar-button
1111
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
@@ -769,7 +769,6 @@ a.atcb-modal-btn:not([disabled]):hover {
769769
display: -webkit-box;
770770
-webkit-line-clamp: var(--date-btn-headline-line-clamp);
771771
line-clamp: var(--date-btn-headline-line-clamp);
772-
-webkit-box-orient: vertical;
773772
}
774773

775774
.atcb-date-btn-content {
@@ -789,7 +788,6 @@ a.atcb-modal-btn:not([disabled]):hover {
789788
display: -webkit-box;
790789
-webkit-line-clamp: 1;
791790
line-clamp: 1;
792-
-webkit-box-orient: vertical;
793791
word-break: break-all;
794792
}
795793

‎package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "add-to-calendar-button",
3-
"version": "2.8.8",
3+
"version": "2.8.9",
44
"engines": {
55
"node": ">=18.17.0",
66
"npm": ">=9.6.7"

‎src/atcb-control.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Add to Calendar Button
44
* ++++++++++++++++++++++
55
*
6-
* Version: 2.8.8
6+
* Version: 2.8.9
77
* Creator: Jens Kuerschner (https://jekuer.com)
88
* Project: https://github.com/add2cal/add-to-calendar-button
99
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

‎src/atcb-decorate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Add to Calendar Button
44
* ++++++++++++++++++++++
55
*
6-
* Version: 2.8.8
6+
* Version: 2.8.9
77
* Creator: Jens Kuerschner (https://jekuer.com)
88
* Project: https://github.com/add2cal/add-to-calendar-button
99
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

‎src/atcb-event.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Add to Calendar Button
44
* ++++++++++++++++++++++
55
*
6-
* Version: 2.8.8
6+
* Version: 2.8.9
77
* Creator: Jens Kuerschner (https://jekuer.com)
88
* Project: https://github.com/add2cal/add-to-calendar-button
99
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

‎src/atcb-generate-pro.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Add to Calendar Button
44
* ++++++++++++++++++++++
55
*
6-
* Version: 2.8.8
6+
* Version: 2.8.9
77
* Creator: Jens Kuerschner (https://jekuer.com)
88
* Project: https://github.com/add2cal/add-to-calendar-button
99
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

‎src/atcb-generate-rich-data.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Add to Calendar Button
44
* ++++++++++++++++++++++
55
*
6-
* Version: 2.8.8
6+
* Version: 2.8.9
77
* Creator: Jens Kuerschner (https://jekuer.com)
88
* Project: https://github.com/add2cal/add-to-calendar-button
99
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

‎src/atcb-generate.js

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Add to Calendar Button
44
* ++++++++++++++++++++++
55
*
6-
* Version: 2.8.8
6+
* Version: 2.8.9
77
* Creator: Jens Kuerschner (https://jekuer.com)
88
* Project: https://github.com/add2cal/add-to-calendar-button
99
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
@@ -483,7 +483,7 @@ async function atcb_create_modal(mainHost, data, icon = '', headline, content =
483483
}
484484
modalSubEventButton.classList.add('atcb-subevent-btn');
485485
modalsubEventsContent.append(modalSubEventButton);
486-
atcb_generate_date_button(data, modalSubEventButton, i);
486+
atcb_generate_date_button(data, modalSubEventButton, i, false, true);
487487
// interaction only if not overdue and blocked
488488
if (!data.dates[i - 1].overdue || data.pastDateHandling === 'none') {
489489
if (i === 1 && keyboardTrigger) {
@@ -607,23 +607,23 @@ function atcb_subscribe_yahoo_modal_switch(host, data, keyboardTrigger) {
607607
}
608608

609609
// FUNCTION TO GENERATE A MORE DETAILED DATE BUTTON
610-
function atcb_generate_date_button(data, parent, subEvent = 'all', oneOption = false) {
611-
if (subEvent != 'all') {
610+
function atcb_generate_date_button(data, parent, subEvent = 'all', oneOption = false, forceFullDate = false) {
611+
if (subEvent !== 'all') {
612612
subEvent = parseInt(subEvent) - 1;
613-
} else if (data.dates.length == 1) {
613+
} else if (data.dates.length === 1) {
614614
subEvent = 0;
615615
}
616-
const fullTimeInfo = atcb_generate_timestring(data.dates, data.language, subEvent);
616+
const fullTimeInfo = atcb_generate_timestring(data.dates, data.language, subEvent, false, false, forceFullDate);
617617
const hoverText = (function () {
618618
if ((subEvent !== 'all' && data.dates[`${subEvent}`].status.toLowerCase() === 'cancelled') || (subEvent === 'all' && data.allCancelled)) {
619619
return atcb_translate_hook('date.status.cancelled', data) + '<br>' + atcb_translate_hook('date.status.cancelled.cta', data);
620620
}
621-
if (data.pastDateHandling != 'none') {
622-
if ((subEvent === 'all' && data.allOverdue) || (subEvent != 'all' && data.dates[`${subEvent}`].overdue)) {
621+
if (data.pastDateHandling !== 'none') {
622+
if ((subEvent === 'all' && data.allOverdue) || (subEvent !== 'all' && data.dates[`${subEvent}`].overdue)) {
623623
return atcb_translate_hook('expired', data);
624624
}
625625
}
626-
if (data.label && data.label != '') {
626+
if (data.label && data.label !== '') {
627627
return data.label;
628628
}
629629
return '+ ' + atcb_translate_hook('label.addtocalendar', data);
@@ -635,7 +635,7 @@ function atcb_generate_date_button(data, parent, subEvent = 'all', oneOption = f
635635
return '';
636636
})();
637637
const recurringString = (function () {
638-
if (fullTimeInfo.length == 0) {
638+
if (fullTimeInfo.length === 0) {
639639
return atcb_translate_hook('recurring', data) + ' &#x27F3;';
640640
}
641641
return '&#x27F3;';
@@ -699,8 +699,6 @@ function atcb_generate_date_button(data, parent, subEvent = 'all', oneOption = f
699699
btnDescription.style.display = '-webkit-box';
700700
btnDescription.style.webkitLineClamp = '2';
701701
btnDescription.style.lineClamp = '2';
702-
btnDescription.style.webkitBoxOrient = 'vertical';
703-
btnDescription.style.boxOrient = 'vertical';
704702
btnDetails.append(btnDescription);
705703
} else {
706704
// in other cases, at least give the headline the option to grow

‎src/atcb-globals.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
* Add to Calendar Button
66
* ++++++++++++++++++++++
77
*
8-
* Version: 2.8.8
8+
* Version: 2.8.9
99
* Creator: Jens Kuerschner (https://jekuer.com)
1010
* Project: https://github.com/add2cal/add-to-calendar-button
1111
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
1212
* Note: DO NOT REMOVE THE COPYRIGHT NOTICE ABOVE!
1313
*
1414
*/
15-
const atcbVersion = '2.8.8';
15+
const atcbVersion = '2.8.9';
1616

1717
// DEFINING CSS
1818
const atcbCssTemplate = {};

‎src/atcb-i18n.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Add to Calendar Button
44
* ++++++++++++++++++++++
55
*
6-
* Version: 2.8.8
6+
* Version: 2.8.9
77
* Creator: Jens Kuerschner (https://jekuer.com)
88
* Project: https://github.com/add2cal/add-to-calendar-button
99
* License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

0 commit comments

Comments
 (0)