Skip to content

Remove "dangerous" optimization: #76

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

Open
rdm wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Remove "dangerous" optimization: #76

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 4 additions & 36 deletions jw-player/include/shortcode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// We use a global variable to keep track of all the players that are embedded
// on a page. If multiple videos with the same player are embedded on the
// same page the library only needs to be injected once.
$jwplayer_shortcode_embedded_players = array();

// Regular shortcode function.
function jwplayer_shortcode_handle( $atts ) {
Expand Down Expand Up @@ -185,19 +184,12 @@ function jwplayer_shortcode_filter_player_params( $atts ) {

// Create the JS embed code for the jwplayer player
function jwplayer_shortcode_create_js_embed( $media_hash, $player_hash = null, $params = array() ) {
global $jwplayer_shortcode_embedded_players;
$player_hash = ( null === $player_hash ) ? get_option( 'jwplayer_player' ) : $player_hash;
$content_mask = jwplayer_get_content_mask();
$protocol = ( is_ssl() && JWPLAYER_CONTENT_MASK === $content_mask ) ? 'https' : 'http';

if ( in_array( $player_hash, $jwplayer_shortcode_embedded_players, true ) ) {
$player_script = '';
} else {
// Injecting script tag because there's no way to properly enqueue a javascript
// at this point in the process :'-(
$player_script = true;
$jwplayer_shortcode_embedded_players[] = $player_hash;
}
// Injecting script tag because there's no way to properly enqueue a javascript
// at this point in the process :'-(

if ( 'local' == $media_hash ) {
$element_id = "jwplayer_" . wp_generate_password( 12, false ) . "_div";
Expand Down Expand Up @@ -243,8 +235,7 @@ function jwplayer_shortcode_create_js_embed( $media_hash, $player_hash = null, $

// Redeclare fitVids to stop it from breaking the JW Player embedding.
if ( JWPLAYER_DISABLE_FITVIDS ) {
if ( $player_script ) {
return "
return "
<script type='text/javascript' src='" . esc_url( $js_lib ) . "'></script>
<div id='" . esc_attr( $element_id ) . "'></div>
<script type='text/javascript'>
Expand All @@ -254,22 +245,9 @@ function jwplayer_shortcode_create_js_embed( $media_hash, $player_hash = null, $
);
</script>
";
} else { // no player script
return "
<div id='" . esc_attr( $element_id ) . "'></div>
<script type='text/javascript'>
" . 'if(typeof(jQuery)=="function"){(function($){$.fn.fitVids=function(){}})(jQuery)};' . "
jwplayer('" . esc_attr( $element_id ) . "').setup(
" . wp_json_encode( $params ) . "
);
</script>
";
}
} else {

// no fitvids script here.
if ( $player_script ) {
return "
return "
<script type='text/javascript' src='" . esc_url( $js_lib ) . "'></script>
<div id='" . esc_attr( $element_id ) . "'></div>
<script type='text/javascript'>
Expand All @@ -278,15 +256,5 @@ function jwplayer_shortcode_create_js_embed( $media_hash, $player_hash = null, $
);
</script>
";
} else { // no player script
return "
<div id='" . esc_attr( $element_id ) . "'></div>
<script type='text/javascript'>
jwplayer('" . esc_attr( $element_id ) . "').setup(
" . wp_json_encode( $params ) . "
);
</script>
";
}
}
}