From 0ba0a25b11bd67aeeb47a8179b72152dfd4a36da Mon Sep 17 00:00:00 2001 From: Yassine Doghri <yassine@doghri.fr> Date: Thu, 4 Jul 2024 14:37:54 +0000 Subject: [PATCH] fix(audio-player): set player icons to default instead of missing Castopod's --- app/Helpers/components_helper.php | 3 +-- app/Resources/js/admin-audio-player.ts | 8 -------- app/Resources/js/audio-player.ts | 11 +---------- app/Resources/js/embed.ts | 8 -------- themes/cp_app/embed.php | 3 +-- 5 files changed, 3 insertions(+), 30 deletions(-) diff --git a/app/Helpers/components_helper.php b/app/Helpers/components_helper.php index 1b68b74e1e..2ca9f7a482 100644 --- a/app/Helpers/components_helper.php +++ b/app/Helpers/components_helper.php @@ -352,7 +352,6 @@ if (! function_exists('audio_player')) { id="castopod-vm-player" theme="light" language="{$language}" - icons="castopod-icons" class="{$class} relative z-0" style="--vm-player-box-shadow:0; --vm-player-theme: hsl(var(--color-accent-base)); --vm-control-focus-color: hsl(var(--color-accent-contrast)); --vm-control-spacing: 4px; --vm-menu-item-focus-bg: hsl(var(--color-background-highlight));" > @@ -360,7 +359,7 @@ if (! function_exists('audio_player')) { <source src="{$source}" type="{$mediaType}" /> </vm-audio> <vm-ui> - <vm-icon-library name="castopod-icons"></vm-icon-library> + <vm-icon-library></vm-icon-library> <vm-controls full-width> <vm-playback-control></vm-playback-control> <vm-volume-control></vm-volume-control> diff --git a/app/Resources/js/admin-audio-player.ts b/app/Resources/js/admin-audio-player.ts index 28460b891c..994803a746 100644 --- a/app/Resources/js/admin-audio-player.ts +++ b/app/Resources/js/admin-audio-player.ts @@ -36,14 +36,6 @@ import "@vime/core/themes/default.css"; import "@vime/core/themes/light.css"; import "./modules/play-episode-button"; -// Register Castopod's icons library -const library: HTMLVmIconLibraryElement | null = document.querySelector( - 'vm-icon-library[name="castopod-icons"]' -); -if (library) { - library.resolver = (iconName) => `/assets/icons/${iconName}.svg`; -} - // Vime elements for audio player customElements.define("vm-player", VmPlayer); customElements.define("vm-file", VmFile); diff --git a/app/Resources/js/audio-player.ts b/app/Resources/js/audio-player.ts index 74cebcc251..01e2747018 100644 --- a/app/Resources/js/audio-player.ts +++ b/app/Resources/js/audio-player.ts @@ -62,7 +62,6 @@ const player = html`<div id="castopod-vm-player" theme="light" language="en" - icons="castopod-icons" class="flex-1" style="--vm-player-box-shadow:0; --vm-player-theme: hsl(var(--color-accent-base)); --vm-control-focus-color: hsl(var(--color-accent-contrast)); --vm-menu-item-focus-bg: hsl(var(--color-background-highlight));" > @@ -70,7 +69,7 @@ const player = html`<div <source src="" type="" /> </vm-audio> <vm-ui> - <vm-icon-library name="castopod-icons"></vm-icon-library> + <vm-icon-library></vm-icon-library> <vm-controls full-width> <vm-playback-control></vm-playback-control> <vm-volume-control></vm-volume-control> @@ -86,14 +85,6 @@ const player = html`<div render(player, document.body); -// Register Castopod's icons library -const library: HTMLVmIconLibraryElement | null = document.querySelector( - 'vm-icon-library[name="castopod-icons"]' -); -if (library) { - library.resolver = (iconName) => `/assets/icons/${iconName}.svg`; -} - // Vime elements for audio player customElements.define("vm-player", VmPlayer); customElements.define("vm-file", VmFile); diff --git a/app/Resources/js/embed.ts b/app/Resources/js/embed.ts index 9bad25389e..c0da411df5 100644 --- a/app/Resources/js/embed.ts +++ b/app/Resources/js/embed.ts @@ -35,14 +35,6 @@ import { import "@vime/core/themes/default.css"; import "@vime/core/themes/light.css"; -// Register Castopod's icons library -const library: HTMLVmIconLibraryElement | null = document.querySelector( - 'vm-icon-library[name="castopod-icons"]' -); -if (library) { - library.resolver = (iconName) => `/assets/icons/${iconName}.svg`; -} - // Vime elements for audio player customElements.define("vm-player", VmPlayer); customElements.define("vm-file", VmFile); diff --git a/themes/cp_app/embed.php b/themes/cp_app/embed.php index 498f1de570..f74fb9be14 100644 --- a/themes/cp_app/embed.php +++ b/themes/cp_app/embed.php @@ -40,7 +40,6 @@ id="castopod-vm-player" theme="<?= str_starts_with($theme, 'dark') ? 'dark' : 'light' ?>" language="<?= service('request')->getLocale() ?>" - icons="castopod-icons" class="w-full mt-auto" style="--vm-player-box-shadow:0; --vm-player-theme: hsl(var(--color-accent-base)); --vm-control-focus-color: hsl(var(--color-accent-contrast)); --vm-control-spacing: 4px; --vm-menu-item-focus-bg: hsl(var(--color-background-highlight)); --vm-control-icon-size: 24px; <?= str_ends_with($theme, 'transparent') ? '--vm-controls-bg: transparent;' : '' ?>" > @@ -55,7 +54,7 @@ <source src="<?= $source ?>" type="<?= $episode->audio->file_mimetype ?>" /> </vm-audio> <vm-ui> - <vm-icon-library name="castopod-icons"></vm-icon-library> + <vm-icon-library></vm-icon-library> <vm-controls full-width> <vm-playback-control></vm-playback-control> <vm-volume-control></vm-volume-control> -- GitLab