Skip to content

vertical playlist: run before ready event #472

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
Firiks wants to merge 1 commit into
base: fv-player-7
Choose a base branch
from
Open

vertical playlist: run before ready event #472

Show file tree
Hide file tree
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
9 changes: 0 additions & 9 deletions flowplayer/modules/appearance.module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,6 @@ flowplayer(function(api, root) {
else if( width < 600 && width >= 400 ) size = 'is-small';
root.trigger('fv-player-size', [ size ] );

var el = player;
if( root.parent().hasClass('fp-playlist-vertical-wrapper') || root.parent().hasClass('fp-playlist-text-wrapper') ) el = root.parent(); // in some cases we use the wrapper

if(el.width() <= 560) {
el.addClass('is-fv-narrow');
} else {
el.removeClass('is-fv-narrow');
}

if(width <= 320) { // remove volue bar on narrow players
root.addClass('no-volume fp-mute');
} else {
Expand Down
81 changes: 56 additions & 25 deletions flowplayer/modules/fv-player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ if( typeof(fv_flowplayer_conf) != "undefined" ) {
if( flowplayer.conf.mobile_native_fullscreen && ( 'ontouchstart' in window ) && fls.fvmobile ) {
flowplayer.conf.native_fullscreen = true;
}
if( 'ontouchstart' in window ) {

if( 'ontouchstart' in window ) {
if( fls.android && fls.android.version < 4.4 && ! ( fls.browser.chrome && fls.browser.version > 54 ) ) {
flowplayer.conf.native_fullscreen = true;
}
Expand All @@ -83,6 +83,60 @@ if( typeof(fv_flowplayer_conf) != "undefined" ) {
flowplayer.conf.native_fullscreen = true;
}
}

jQuery('.fp-playlist-vertical-wrapper').each(function(index, element){
var el = jQuery(element);

if(el.width() <= 560) {
el.addClass('is-fv-narrow');
} else {
el.removeClass('is-fv-narrow');
}
});

jQuery('.fp-playlist-text-wrapper').each(function(index, element){
var el = jQuery(element);

if(el.width() <= 560) {
el.addClass('is-fv-narrow');
} else {
el.removeClass('is-fv-narrow');
}
});

function check_size_and_all(playlist) {
if(playlist.length > 1) return;

var property = playlist.hasClass('fp-playlist-only-captions') ? 'height' : 'max-height';
if( playlist.parents('.fp-playlist-text-wrapper').hasClass('is-fv-narrow') ){
property = 'max-height';
}
playlist.css(property,vertical_playlist_height(playlist));
if( property == 'max-height' ) playlist.css('height','auto');
}

function vertical_playlist_height(playlist) {
var root = jQuery('#'+ playlist.attr('rel'));

var height = root.height();
if( height == 0 ) height = root.css('max-height');
return height;
}

jQuery('.fp-playlist-vertical').each(function(index, element) {
var playlist = jQuery(element);
check_size_and_all(playlist);
});

jQuery(window).on('resize tabsactivate', function() {
setTimeout( function(){
jQuery('fp-playlist-vertical').each(function(index, element) {
var playlist = jQuery(element);
check_size_and_all(playlist);
});
}, 0 );
});

}
if( typeof(fv_flowplayer_translations) != "undefined" ) {
flowplayer.defaults.errors = fv_flowplayer_translations;
Expand Down Expand Up @@ -398,29 +452,6 @@ function fv_player_preload() {
fv_player_notice(root,fv_flowplayer_translations[8],2000);
});

//is this needed?
playlist = jQuery(root).parent().find('div.fp-playlist-vertical[rel='+jQuery(root).attr('id')+']');
if( playlist.length ){
function check_size_and_all() {
var property = playlist.hasClass('fp-playlist-only-captions') ? 'height' : 'max-height';
if( playlist.parents('.fp-playlist-text-wrapper').hasClass('is-fv-narrow') ){
property = 'max-height';
}
playlist.css(property,vertical_playlist_height());
if( property == 'max-height' ) playlist.css('height','auto');
}
check_size_and_all();
jQuery(window).on('resize tabsactivate', function() {
setTimeout( check_size_and_all, 0 );
} );
}

function vertical_playlist_height() {
var height = root.height();
if( height == 0 ) height = root.css('max-height');
return height;
}

api.show_status = function( type ) {
var status = '';
[ 'loading', 'ready', 'playing', 'paused', 'seeking' ].every( function(v,k) {
Expand Down