Skip to content

Commit

Permalink
Moved method into helper [WEB-2962]
Browse files Browse the repository at this point in the history
  • Loading branch information
zachgarwood committed Feb 25, 2025
1 parent 46b7b10 commit ef57aa3
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 16 deletions.
11 changes: 11 additions & 0 deletions app/Helpers/ImageHelpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,7 @@ public static function aic_getIconClass($key = 0)

return Str::kebab($icons[$key]);
}

public static function getSocialIcon($url)
{
$host = parse_url($url, PHP_URL_HOST);
Expand All @@ -688,4 +689,14 @@ public static function getSocialIcon($url)
// The second-to-last domain item is the host domain
return $domains[count($domains) - 2] ?? null;
}

/**
* @link https://github.com/openseadragon/openseadragon/pull/1285/files
*/
public static function getImgixTileSource($model, $role, $crop = 'default')
{
if ($media = $model->imageObject($role, $crop)) {
return 'https://' . config('twill.imgix_source_host') . '/' . $media->uuid . '?fm=json&osd=imgix';
}
}
}
12 changes: 0 additions & 12 deletions app/Models/Vendor/Block.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,4 @@ public function getAssetLibraryAttribute()

return null;
}

/**
* @link https://github.com/openseadragon/openseadragon/pull/1285/files
*/
public function getImgixTileSource($role, $crop = 'default')
{
$media = $this->findMedia($role, $crop);

if ($media) {
return 'https://' . config('twill.imgix_source_host') . '/' . $media->uuid . '?fm=json&osd=imgix';
}
}
}
2 changes: 1 addition & 1 deletion resources/views/site/blocks/gallery_new.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
if (($block->input('is_gallery_zoomable') ?? false) || $item->input('is_zoomable')) {
if (isset($mediaItem['media'])) {
$mediaItem['media']['iiifId'] = $item->getImgixTileSource('image', 'desktop');
$mediaItem['media']['iiifId'] = \App\Helpers\ImageHelpers::getImgixTileSource($item, 'image', 'desktop');
}
}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/site/blocks/image.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
'restrict' => $image['restict'] ?? false,
'fullscreen' => $isZoomable,
'iiifId' => $isZoomable
? $block->getImgixTileSource('image', 'desktop')
? \App\Helpers\ImageHelpers::getImgixTileSource($block, 'image', 'desktop')
: null,
],
'showUrl' => !empty($block->input('image_link')),
Expand Down
4 changes: 2 additions & 2 deletions resources/views/site/blocks/image_slider.blade.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@php
$leftImage = $block->getImgixTileSource('left_image');
$rightImage = $block->getImgixTileSource('right_image');
$leftImage = \App\Helpers\ImageHelpers::getImgixTileSource($block, 'left_image');
$rightImage = \App\Helpers\ImageHelpers::getImgixTileSource($block, 'right_image');
$referenceImage = $block->imageAsArray('left_image', 'default');
@endphp
Expand Down

0 comments on commit ef57aa3

Please sign in to comment.