From 2c35d5bd2c34db7083922a4838ddd157664a00d7 Mon Sep 17 00:00:00 2001 From: Jack Wilkinson Date: Tue, 1 Feb 2022 00:25:06 +0000 Subject: [PATCH 1/4] Added asset filter --- modules/system/twig/Extension.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/system/twig/Extension.php b/modules/system/twig/Extension.php index ef2539a876..27c067e42f 100644 --- a/modules/system/twig/Extension.php +++ b/modules/system/twig/Extension.php @@ -55,6 +55,7 @@ public function getFilters() $filters = [ new TwigSimpleFilter('app', [$this, 'appFilter'], ['is_safe' => ['html']]), new TwigSimpleFilter('media', [$this, 'mediaFilter'], ['is_safe' => ['html']]), + new TwigSimpleFilter('asset', [$this, 'assetFilter'], ['is_safe' => ['html']]), new TwigSimpleFilter('resize', [$this, 'resizeFilter'], ['is_safe' => ['html']]), new TwigSimpleFilter('imageWidth', [$this, 'imageWidthFilter'], ['is_safe' => ['html']]), new TwigSimpleFilter('imageHeight', [$this, 'imageHeightFilter'], ['is_safe' => ['html']]), @@ -105,6 +106,16 @@ public function mediaFilter($file) return MediaLibrary::url($file); } + /** + * Converts supplied file to a URL relative to the `app.asset_url` config. + * @param string $file Specifies the asset-relative file + * @return string + */ + public function assetFilter($file) + { + return Url::asset($file); + } + /** * Converts supplied input into a URL that will return the desired resized image * From 9ccd47689f429ea714240abbdea3cf79adc3bdfb Mon Sep 17 00:00:00 2001 From: Jack Wilkinson Date: Mon, 7 Feb 2022 01:01:34 +0000 Subject: [PATCH 2/4] Mirrored system filters as functions --- modules/system/twig/Extension.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/system/twig/Extension.php b/modules/system/twig/Extension.php index 27c067e42f..5a98ca8f05 100644 --- a/modules/system/twig/Extension.php +++ b/modules/system/twig/Extension.php @@ -1,5 +1,6 @@ Date: Mon, 7 Feb 2022 01:19:01 +0000 Subject: [PATCH 3/4] Removed is_safe html from system filters --- modules/system/twig/Extension.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/system/twig/Extension.php b/modules/system/twig/Extension.php index 5a98ca8f05..05cfd086b0 100644 --- a/modules/system/twig/Extension.php +++ b/modules/system/twig/Extension.php @@ -61,12 +61,12 @@ public function getFunctions() public function getFilters() { $filters = [ - new TwigSimpleFilter('app', [$this, 'appFilter'], ['is_safe' => ['html']]), - new TwigSimpleFilter('media', [$this, 'mediaFilter'], ['is_safe' => ['html']]), - new TwigSimpleFilter('asset', [$this, 'assetFilter'], ['is_safe' => ['html']]), - new TwigSimpleFilter('resize', [$this, 'resizeFilter'], ['is_safe' => ['html']]), - new TwigSimpleFilter('imageWidth', [$this, 'imageWidthFilter'], ['is_safe' => ['html']]), - new TwigSimpleFilter('imageHeight', [$this, 'imageHeightFilter'], ['is_safe' => ['html']]), + new TwigSimpleFilter('app', [$this, 'appFilter']), + new TwigSimpleFilter('media', [$this, 'mediaFilter']), + new TwigSimpleFilter('asset', [$this, 'assetFilter']), + new TwigSimpleFilter('resize', [$this, 'resizeFilter']), + new TwigSimpleFilter('imageWidth', [$this, 'imageWidthFilter']), + new TwigSimpleFilter('imageHeight', [$this, 'imageHeightFilter']), ]; /* From 26ecdb002e576d5321374c7ae073579054dcf5d9 Mon Sep 17 00:00:00 2001 From: Jack Wilkinson Date: Mon, 7 Feb 2022 01:26:07 +0000 Subject: [PATCH 4/4] Sorted imports --- modules/system/twig/Extension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/system/twig/Extension.php b/modules/system/twig/Extension.php index 05cfd086b0..c564854d14 100644 --- a/modules/system/twig/Extension.php +++ b/modules/system/twig/Extension.php @@ -1,11 +1,11 @@