Skip to content

Fix popup not shown after ad #153

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
martinambrus wants to merge 5 commits into
base: fv-player-7
Choose a base branch
from
Open

Fix popup not shown after ad #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d8ee672
fix: popups not being shown when a video has ad showing at the end
martinambrus Feb 6, 2018
6cc9ca3
chore: this should probably be in the release branch, too
martinambrus Feb 6, 2018
4cc84a0
fix: PPV popup not shown when AD follows the preview video
martinambrus Feb 6, 2018
3d9463e
fix: forgotten debug logs
martinambrus Feb 6, 2018
8bdd2f4
fix: not advancing further when popup is to be shown b4 the last AD
martinambrus Feb 13, 2018
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
18 changes: 12 additions & 6 deletions flowplayer-beta/fv-flowplayer.min.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,7 @@ flowplayer(function (api,root) {
api.trigger('finish', [ api] );
});
}

var player_id = root.attr('id');
api.bind("ready", function (e, api) {
//console.log('ad ready to show',root.attr('class'));
Expand All @@ -857,18 +857,19 @@ flowplayer(function (api,root) {
root.find('.fp-player').append( '<div id="'+player_id+'_ad" class="wpfp_custom_ad">'+html+'</div>' );
}
}).bind("finish", function (e, api) {
if( typeof(api.video.index) == "undefined" || api.video.index+1 == api.conf.playlist.length ) {
if( root.find('.wpfp_custom_popup').length > 0) {
if( typeof(api.video.index) == "undefined" || api.video.index+1 == api.conf.playlist.length || api.video.index+2 == api.conf.playlist.length ) {
// just an ordinary popup
if (root.find('.wpfp_custom_popup').length > 0) {
root.find('.wpfp_custom_popup').show();
} else if( typeof(fv_flowplayer_popup) != "undefined" && typeof(fv_flowplayer_popup[player_id]) != "undefined" ) {
root.find('.fp-player').append( '<div id="'+player_id+'_custom_popup" class="wpfp_custom_popup">'+fv_flowplayer_popup[player_id].html+'</div>' );
} else if (typeof(fv_flowplayer_popup) != "undefined" && typeof(fv_flowplayer_popup[player_id]) != "undefined") {
root.find('.fp-player').append('<div id="' + player_id + '_custom_popup" class="wpfp_custom_popup">' + fv_flowplayer_popup[player_id].html + '</div>');
}
}

}).bind("pause", function (e, api) {
// NOTE: this feature is for showing a Pay Per View purchase popup, when the PPV plugin is enabled,
// it does nothing with ads or other popups!
if( typeof(api.video.index) == "undefined" || api.video.index+1 == api.conf.playlist.length ) {
if( typeof(api.video.index) == "undefined" || api.video.index+1 == api.conf.playlist.length || api.video.index+2 == api.conf.playlist.length ) {
if( root.find('.wpfp_custom_popup').length > 0 && root.find('.wpfp_custom_popup > .fv-player-ppv-purchase-btn-wrapper')) {
root.find('.wpfp_custom_popup').show();
} else if( typeof(fv_flowplayer_popup) != "undefined" && typeof(fv_flowplayer_popup[player_id]) != "undefined" && fv_flowplayer_popup[player_id].html.indexOf('fv-player-ppv-purchase-btn-wrapper') > -1 ) {
Expand All @@ -888,6 +889,11 @@ flowplayer(function (api,root) {
next();
} );*/
}

// do not advance to the last AD if there's a popup to be shown
if (api.video.index+2 == api.conf.playlist.length) {
api.conf.advance = false;
}
});
});

Expand Down
18 changes: 12 additions & 6 deletions flowplayer/fv-flowplayer.min.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ flowplayer( function(api,root) {
}, 100 );
});

api.bind('finish', function() {
api.bind('finish', function() {
if( root.data('fv_redirect') ) {
var url = root.data('fv_redirect');
var windowFVFlowplayerRedirect = window.open(url, '_blank');
Expand Down Expand Up @@ -848,18 +848,19 @@ flowplayer(function (api,root) {
root.find('.fp-player').append( '<div id="'+player_id+'_ad" class="wpfp_custom_ad">'+html+'</div>' );
}
}).bind("finish", function (e, api) {
if( typeof(api.video.index) == "undefined" || api.video.index+1 == api.conf.playlist.length ) {
if( root.find('.wpfp_custom_popup').length > 0) {
if( typeof(api.video.index) == "undefined" || api.video.index+1 == api.conf.playlist.length || api.video.index+2 == api.conf.playlist.length ) {
// just an ordinary popup
if (root.find('.wpfp_custom_popup').length > 0) {
root.find('.wpfp_custom_popup').show();
} else if( typeof(fv_flowplayer_popup) != "undefined" && typeof(fv_flowplayer_popup[player_id]) != "undefined" ) {
root.find('.fp-player').append( '<div id="'+player_id+'_custom_popup" class="wpfp_custom_popup">'+fv_flowplayer_popup[player_id].html+'</div>' );
} else if (typeof(fv_flowplayer_popup) != "undefined" && typeof(fv_flowplayer_popup[player_id]) != "undefined") {
root.find('.fp-player').append('<div id="' + player_id + '_custom_popup" class="wpfp_custom_popup">' + fv_flowplayer_popup[player_id].html + '</div>');
}
}

}).bind("pause", function (e, api) {
// NOTE: this feature is for showing a Pay Per View purchase popup, when the PPV plugin is enabled,
// it does nothing with ads or other popups!
if( typeof(api.video.index) == "undefined" || api.video.index+1 == api.conf.playlist.length ) {
if( typeof(api.video.index) == "undefined" || api.video.index+1 == api.conf.playlist.length || api.video.index+2 == api.conf.playlist.length ) {
if( root.find('.wpfp_custom_popup').length > 0 && root.find('.wpfp_custom_popup > .fv-player-ppv-purchase-btn-wrapper')) {
root.find('.wpfp_custom_popup').show();
} else if( typeof(fv_flowplayer_popup) != "undefined" && typeof(fv_flowplayer_popup[player_id]) != "undefined" && fv_flowplayer_popup[player_id].html.indexOf('fv-player-ppv-purchase-btn-wrapper') > -1 ) {
Expand All @@ -879,6 +880,11 @@ flowplayer(function (api,root) {
next();
} );*/
}

// do not advance to the last AD if there's a popup to be shown
if (api.video.index+2 == api.conf.playlist.length) {
api.conf.advance = false;
}
});
});

Expand Down