Skip to content

Cloudinary video player does not conform to transformation string set in the settings #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Feb 7, 2020
Merged

Cloudinary video player does not conform to transformation string set in the settings #42

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7c6c27a
Manually apply global video transforms to url onload
Feb 5, 2020
0f7e5b9
Add overflow: hidden to prevent controls going out of bound
Feb 5, 2020
6d79654
Prevent variable collision in js
Feb 5, 2020
cba0823
Adjust code to avoid multiple window.onload calls
Feb 6, 2020
33a765f
Reformat generated JS
Feb 6, 2020
032c945
Escape javascript output appropriately and make code more readable
Feb 7, 2020
5cb9a95
Prevent code duplication and utilize loops instead
Feb 7, 2020
7739304
Remove redundant PHP tags
Feb 7, 2020
fd2918d
Indent the first line to the level of the php code
Feb 7, 2020
369556f
Remove unused method that wraps JS in an onload handler
Feb 7, 2020
42831d2
Rename vars to prevent global variable name collisions
Feb 7, 2020
716bcd5
Indents JS back to the PHP level
Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 45 additions & 7 deletions cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/media/class-video.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ public function print_video_scripts() {

if ( $this->player_enabled() && ! empty( $this->attachments ) ) {

$code = array();
$cld_videos = array();
foreach ( $this->attachments as $instance => $video ) {
// @todo - ping the URL to ensure it has transformation available, else update an eager.
$cloudinary_id = $this->media->get_public_id( $video['id'] );
Expand All @@ -338,16 +338,54 @@ public function print_video_scripts() {
}

$config = wp_parse_args( $video['args'], $default );
// Sizing.
if ( empty( $config['size'] ) ) {

if ( empty( $config['size'] ) && ! isset( $this->config['video_freeform'] ) ) {
$config['fluid'] = true;
}
$code[] = 'cld.videoPlayer(\'cloudinary-video-' . $instance . '\', ' . wp_json_encode( $config ) . ');';

$cld_videos[ $instance ] = $config;

}

if ( empty( $cld_videos ) ) {
return;
}
// If code was populated, output.
if ( ! empty( $code ) ) {
wp_add_inline_script( 'cld-player', implode( $code ) );

ob_start();
?>
var cldVideos = <?php echo wp_json_encode( $cld_videos ); ?>;

for ( var videoInstance in cldVideos ) {
var cldConfig = cldVideos[ videoInstance ];
var cldId = 'cloudinary-video-' + videoInstance;
cld.videoPlayer( cldId, cldConfig );
}

<?php if ( $this->config['video_freeform'] ): ?>
window.addEventListener( 'load', function() {
for ( var videoInstance in cldVideos ) {
var cldId = 'cloudinary-video-' + videoInstance;
var videoContainer = document.getElementById( cldId );
var videoElement = videoContainer.getElementsByTagName( 'video' );

if ( videoElement.length === 1 ) {
videoElement = videoElement[0];
videoElement.src = videoElement.src.replace(
'upload/',
'upload/<?php echo esc_js( $this->config['video_freeform'] ) ?>/'
);
}
}
} );
<?php
endif;

$script = ob_get_clean();

wp_add_inline_script(
'cld-player',
$script
);
}
}

Expand Down