Skip to content

Commit

Permalink
Merge pull request #618 from add2cal/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
jekuer authored Aug 19, 2024
2 parents 4f258d8 + 0fc9fd0 commit 19e81f3
Show file tree
Hide file tree
Showing 34 changed files with 968 additions and 657 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
]
},

"extends": ["plugin:@typescript-eslint/recommended", "eslint:recommended", "plugin:security/recommended-legacy", "plugin:prettier/recommended"],
"extends": ["plugin:@typescript-eslint/recommended", "eslint:recommended", "plugin:security/recommended-legacy", "plugin:prettier/recommended", "plugin:wc/recommended"],

"plugins": ["@typescript-eslint", "prettier"],

Expand Down
2 changes: 1 addition & 1 deletion assets/css/atcb-3d.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* Style: 3D
*
* Version: 2.6.18
* Version: 2.6.19
* 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)
Expand Down
2 changes: 1 addition & 1 deletion assets/css/atcb-date.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* Style: Date
*
* Version: 2.6.18
* Version: 2.6.19
* 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)
Expand Down
2 changes: 1 addition & 1 deletion assets/css/atcb-flat.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* Style: Flat
*
* Version: 2.6.18
* Version: 2.6.19
* 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)
Expand Down
2 changes: 1 addition & 1 deletion assets/css/atcb-neumorphism.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* Style: Neumorphism
*
* Version: 2.6.18
* Version: 2.6.19
* 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)
Expand Down
2 changes: 1 addition & 1 deletion assets/css/atcb-round.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* Style: Round
*
* Version: 2.6.18
* Version: 2.6.19
* 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)
Expand Down
2 changes: 1 addition & 1 deletion assets/css/atcb-text.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* Style: Text
*
* Version: 2.6.18
* Version: 2.6.19
* 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)
Expand Down
2 changes: 1 addition & 1 deletion assets/css/atcb.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* Style: Default
*
* Version: 2.6.18
* Version: 2.6.19
* 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)
Expand Down
4 changes: 2 additions & 2 deletions demo/components/controls/configSearch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ onMounted(() => {
onSubmit: (value: string) => {
if (value !== undefined) {
const goTo = value.toLowerCase();
searchInput.value && searchInput.value.blur();
if (searchInput.value) searchInput.value.blur();
searchInput.value.value = '';
// push the route, but add some delay to work around some android soft keyboard issues
setTimeout( () => navigateTo({path: localePath('configuration'), hash: '#' + goTo}), 200);
Expand All @@ -138,7 +138,7 @@ onMounted(() => {
const onSearchInputFocus = () => {
isInputFocused.value = true;
searchInput.value && searchInput.value.select();
if (searchInput.value) searchInput.value.select();
}
const onSearchInputBlur = () => {
Expand Down
8 changes: 4 additions & 4 deletions demo/components/controls/timezoneAutocomplete.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const elNoResultsID = (function() {
onMounted(() => {
if (props.modelValue && getFilteredTimezoneOptions().includes(props.modelValue.toString())) {
searchInput.value && (searchInput.value.value = props.modelValue)
if (searchInput.value) searchInput.value.value = props.modelValue;
}
if (import.meta.client) {
Expand All @@ -76,7 +76,7 @@ onMounted(() => {
onSubmit: (value: string) => {
if (value !== undefined) {
emit('update:modelValue', value);
searchInput.value && searchInput.value.blur();
if (searchInput.value) searchInput.value.blur();
}
},
autoSelect: true,
Expand All @@ -87,7 +87,7 @@ onMounted(() => {
const onSearchInputFocus = () => {
isInputFocused.value = true;
searchInput.value && searchInput.value.select();
if (searchInput.value) searchInput.value.select();
}
const onSearchInputBlur = () => {
Expand All @@ -107,7 +107,7 @@ const onSearchInputBlur = () => {
// watch props changes to synch mobile and desktop field here
if (import.meta.client) {
watch(props, () => {
searchInput.value && (searchInput.value.value = props.modelValue);
if (searchInput.value) searchInput.value.value = props.modelValue;
});
}
</script>
Expand Down
2 changes: 1 addition & 1 deletion demo/components/footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function topFunction() {
</span>
<div class="mt-6 text-xs sm:mt-5 md:mt-3">
<span class="font-semibold text-zinc-500 dark:text-zinc-400"> &copy; {{new Date().getFullYear()}} </span>
<span class="lowercase text-zinc-400 dark:text-zinc-500"> , Current Version: 2.6.18 </span>
<span class="lowercase text-zinc-400 dark:text-zinc-500"> , Current Version: 2.6.19 </span>
</div>
</div>
<div class="hidden self-center sm:block">
Expand Down
10 changes: 8 additions & 2 deletions demo/components/playground/playgroundArea.vue
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,14 @@ if (import.meta.client) {
</div>
<div id="code-output" :class="[ !showCode ? 'mx-8 bg-zinc-300 dark:bg-zinc-800' : 'mx-2 bg-zinc-200 pb-0 dark:bg-zinc-800 md:mx-0' ]" class="rounded-b-md border-2 border-t-0 border-zinc-400 p-2 shadow-lg transition-all dark:border-zinc-600">
<div class="cursor-pointer text-center text-sm font-semibold text-zinc-600 hover:text-black dark:text-zinc-400 dark:hover:text-secondary" @click="showCode = !showCode">
<span :class="{ hidden: showCode }"> <EyeIcon class="-mt-1 mr-2 inline-block h-5 w-5" aria-hidden="true" />{{ t('labels.showCode') }} </span>
<span :class="{ hidden: !showCode }"> <EyeSlashIcon class="-mt-1 mr-2 inline-block h-5 w-5" aria-hidden="true" />{{ t('labels.hideCode') }} </span>
<span :class="{ hidden: showCode }">
<EyeIcon class="-mt-1 mr-2 inline-block h-5 w-5" aria-hidden="true" />
{{ t('labels.showCode') }}
</span>
<span :class="{ hidden: !showCode }">
<EyeSlashIcon class="-mt-1 mr-2 inline-block h-5 w-5" aria-hidden="true" />
{{ t('labels.hideCode') }}
</span>
</div>
<div :class="{ hidden: !showCode }" class="m-2 mt-3">
<LazyCodeBlock v-if="loaded">{{ attrsToHtmlString(data) }}</LazyCodeBlock>
Expand Down
4 changes: 2 additions & 2 deletions demo/components/statsBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const loadGitHubRepoData = async () => {
if (response.ok) {
const json = await response.json();
json?.stargazers_count && (data.value.github.stars = json.stargazers_count);
if (json?.stargazers_count) data.value.github.stars = json.stargazers_count;
}
}
Expand Down Expand Up @@ -120,7 +120,7 @@ const loadJsdelivrStats = async () => {
const response = await fetch(jsdelivrStatsUrl);
if (response.ok) {
const json = await response.json();
json?.hits.total && (data.value.jsdelivr.montlyHits = json.hits.total);
if (json?.hits.total) data.value.jsdelivr.montlyHits = json.hits.total;
}
};
</script>
Expand Down
Loading

0 comments on commit 19e81f3

Please sign in to comment.