Compare commits

..

No commits in common. "267d382535af4be8e55667e885a57a005174409d" and "34713d9acbbcf380f34d1675c3406f8714949ee7" have entirely different histories.

6 changed files with 42 additions and 23 deletions

View File

@ -0,0 +1,4 @@
function get_height(container, ratio) {
var height = $(container).width() / ratio
return height
}

View File

@ -1,15 +0,0 @@
function adjust_vimeo_height() {
$(".embeded-vimeo-wrapper").each(function() {
var iframe = $(this).find('iframe')
var height = $(iframe).width() / $(iframe).attr('ratio')
$(iframe).prop("height", height)
});
}
jQuery(document).ready(function() {
adjust_vimeo_height();
});
$(window).resize(function() {
adjust_vimeo_height();
});

View File

@ -32,6 +32,7 @@ return [
'title' => '', 'title' => '',
'renderSourceLink' => true, 'renderSourceLink' => true,
'width' => 100, 'width' => 100,
'ratio' => '2',
'wrapStyle' => 'overflow-y: hidden;display: flex;flex-direction: column;justify-content: center;', 'wrapStyle' => 'overflow-y: hidden;display: flex;flex-direction: column;justify-content: center;',
] ]
] ]

View File

@ -17,6 +17,11 @@ class VimeoBlockForm extends Form
'label' => 'Width', 'label' => 'Width',
'value_options' => Module::IMAGE_WIDTH, 'value_options' => Module::IMAGE_WIDTH,
], ],
/*
'attributes' => [
'min' => '100',
],
*/
]); ]);
$this->add([ $this->add([

View File

@ -49,6 +49,7 @@ class Vimeo extends AbstractBlockLayout
$form->setData([ $form->setData([
'o:block[__blockIndex__][o:data][title]' => $data['title'], 'o:block[__blockIndex__][o:data][title]' => $data['title'],
'o:block[__blockIndex__][o:data][width]' => $data['width'], 'o:block[__blockIndex__][o:data][width]' => $data['width'],
'o:block[__blockIndex__][o:data][ratio]' => $data['ratio'],
'o:block[__blockIndex__][o:data][renderSourceLink]' => $data['renderSourceLink'], 'o:block[__blockIndex__][o:data][renderSourceLink]' => $data['renderSourceLink'],
]); ]);
$form->prepare(); $form->prepare();
@ -70,10 +71,14 @@ class Vimeo extends AbstractBlockLayout
return ''; return '';
} }
$media = $attachments[0]->item()->media()[0]; $media = $attachments[0]->item()->media()[0];
$ratio = $media->mediaData()['width'] / $media->mediaData()['height']; $width = $media->mediaData()['width'];
$width = 100;
$height = 0;
// creates an iframe injecting our width and calculated ratio // creates an iframe injecting our width and calculated ratio and height
$attribs= 'ratio="'.$ratio.'"'.PHP_EOL; $attribs=" ";
$original_width = 0;
$original_height = 0;
$doc = new DOMDocument(); $doc = new DOMDocument();
$doc->loadHTML($media->mediaData()['html']); $doc->loadHTML($media->mediaData()['html']);
$html_element= $doc->getElementsByTagName('iframe')->item(0); $html_element= $doc->getElementsByTagName('iframe')->item(0);
@ -82,11 +87,12 @@ class Vimeo extends AbstractBlockLayout
$name = $attr->nodeName; $name = $attr->nodeName;
$value = $attr->nodeValue; $value = $attr->nodeValue;
if ($name == 'height') { if ($name == 'height') {
// we will calculate height with jQuery $original_height = $value;
continue; continue;
} }
if ($name == 'width') { if ($name == 'width') {
$attrib = 'width="'.$block->dataValue('width').'%"'; $original_width = $value;
$attrib = $name.'="'.$width.'%"';
$attribs .= $attrib.PHP_EOL; $attribs .= $attrib.PHP_EOL;
continue; continue;
} }
@ -94,12 +100,18 @@ class Vimeo extends AbstractBlockLayout
$attribs .= $attrib.PHP_EOL; $attribs .= $attrib.PHP_EOL;
} }
} }
if ($original_height !== 0) {
$ratio = $original_width / $original_height;
$attrib = 'ratio="'.$ratio.'"';
$attribs .= $attrib.PHP_EOL;
}
$iframe = "<iframe ".$attribs." >".PHP_EOL."</iframe>"; $iframe = "<iframe ".$attribs." >".PHP_EOL."</iframe>";
return $view->partial('common/block-layout/vimeo', [ return $view->partial('common/block-layout/vimeo', [
'title' => $block->dataValue('title'), 'title' => $block->dataValue('title'),
'renderSourceLink' => $block->dataValue('renderSourceLink'), 'renderSourceLink' => $block->dataValue('renderSourceLink'),
'item_url' => $attachments[0]->item()->url(), 'item_url' => $attachments[0]->item()->url(),
'ratio' => $ratio,
'vimeo_iframe' => $iframe 'vimeo_iframe' => $iframe
]); ]);
} }

View File

@ -1,9 +1,9 @@
<?php <?php
$this->headScript()->appendFile($this->assetUrl('js/media_dimensions.js', $this->headScript()->appendFile($this->assetUrl('js/height_calculator.js',
'Vimeo')); 'Vimeo'));
?> ?>
<div class="embeded-vimeo-wrapper" <div class="vimeo-embed-wrapper"
style="position:relative;"> style="position:relative;">
<?php if ($renderSourceLink) { ?> <?php if ($renderSourceLink) { ?>
@ -23,5 +23,17 @@ $this->headScript()->appendFile($this->assetUrl('js/media_dimensions.js',
</div> </div>
<script> <script>
function adjust_height() {
$(".vimeo-embed-wrapper").each(function() {
var iframe = $(this).find('iframe')
var ratio = $(iframe).attr('ratio')
$(iframe).prop("height", get_height(iframe, ratio))
});
}
jQuery(document).ready(function() {
adjust_height();
});
$( window ).resize(function() {
adjust_height();
});
</script> </script>