diff --git a/test/integration/frontend/player-data.json b/test/integration/frontend/player-data.json
index cff146dc9..1726e4a68 100644
--- a/test/integration/frontend/player-data.json
+++ b/test/integration/frontend/player-data.json
@@ -1 +1 @@
-{"ab":"","ad":"","ad_height":"","ad_width":"","ad_skip":"","align":"","autoplay":"","controlbar":"","copy_text":"","embed":"off","end_actions":"","end_action_value":"","height":"","hflip":"","lightbox":"","lightbox_caption":"","lightbox_height":"","lightbox_width":"","player_name":"MP4 Test Playlist","player_slug":"","playlist":"","playlist_advance":"","qsel":"","share":"no","share_title":"","share_url":"","speed":"","sticky":"","video_ads":"","video_ads_post":"","width":"","videos":[{"caption":"Fire","end":"","mobile":"","rtmp":"","rtmp_path":"","splash":"https://foliovision.com/video/burning-hula-hoop-girl-dominika.jpg","splash_text":"","src":"https://foliovision.com/videos/dominika-960-31.mp4","src1":"","src2":"","start":"","meta":[]},{"caption":"PayPal Background Video","end":"","mobile":"","rtmp":"","rtmp_path":"","splash":"https://foliovision.com/videos/paypal-splash.jpg","splash_text":"","src":"https://foliovision.com/videos/Paypal-video-on-home-page.mp4","src1":"","src2":"","start":"","meta":[{"meta_key":"subtitles_en","meta_value":"https://foliovision.com/videos/paypal-splash.vtt"}]},{"caption":"Carly Simon","end":"","mobile":"","rtmp":"","rtmp_path":"","splash":"https://foliovision.com/images/2014/01/carly-simon-1971-anticipation.png","splash_text":"","src":"https://foliovision.com/videos/Carly-Simon-Anticipation-1971.mp4","src1":"","src2":"","start":"","meta":[{"meta_key":"subtitles_en","meta_value":"https://foliovision.com/images/2014/01/carly-simon-1971-anticipation.vtt"}]}]}
\ No newline at end of file
+{"ab":"","ad":"","ad_height":"","ad_width":"","ad_skip":"","align":"","autoplay":"","controlbar":"","copy_text":"","embed":"off","end_actions":"","end_action_value":"","height":"","hflip":"","lightbox":"","lightbox_caption":"","lightbox_height":"","lightbox_width":"","player_name":"MP4 Test Playlist","player_slug":"","playlist":"","playlist_advance":"","qsel":"","share":"no","share_title":"","share_url":"","speed":"","sticky":"","video_ads":"","video_ads_post":"","width":"","status":"","videos":[{"caption":"Fire","end":"","mobile":"","rtmp":"","rtmp_path":"","splash":"https://foliovision.com/video/burning-hula-hoop-girl-dominika.jpg","splash_text":"","src":"https://foliovision.com/videos/dominika-960-31.mp4","src1":"","src2":"","start":"","meta":[]},{"caption":"PayPal Background Video","end":"","mobile":"","rtmp":"","rtmp_path":"","splash":"https://foliovision.com/videos/paypal-splash.jpg","splash_text":"","src":"https://foliovision.com/videos/Paypal-video-on-home-page.mp4","src1":"","src2":"","start":"","meta":[{"meta_key":"subtitles_en","meta_value":"https://foliovision.com/videos/paypal-splash.vtt"}]},{"caption":"Carly Simon","end":"","mobile":"","rtmp":"","rtmp_path":"","splash":"https://foliovision.com/images/2014/01/carly-simon-1971-anticipation.png","splash_text":"","src":"https://foliovision.com/videos/Carly-Simon-Anticipation-1971.mp4","src1":"","src2":"","start":"","meta":[{"meta_key":"subtitles_en","meta_value":"https://foliovision.com/images/2014/01/carly-simon-1971-anticipation.vtt"}]}]}
\ No newline at end of file
diff --git a/test/integration/frontend/testSimpleShortcode.html b/test/integration/frontend/testSimpleShortcode.html
index e9d098928..9017740c9 100644
--- a/test/integration/frontend/testSimpleShortcode.html
+++ b/test/integration/frontend/testSimpleShortcode.html
@@ -78,43 +78,45 @@
 /* ]]> */
 </script>
 <script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/flowplayer.min.js?ver=1.2.3' id='flowplayer-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/fv-player.js?ver=1.2.3' id='fv-player-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/abr-remember.module.js?ver=1.2.3' id='fv-player-abr-remember.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/ad-popup.module.js?ver=1.2.3' id='fv-player-ad-popup.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/analytics.module.js?ver=1.2.3' id='fv-player-analytics.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/appearance.module.js?ver=1.2.3' id='fv-player-appearance.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/audio-player.module.js?ver=1.2.3' id='fv-player-audio-player.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/chromecast.module.js?ver=1.2.3' id='fv-player-chromecast.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/compatibility.module.js?ver=1.2.3' id='fv-player-compatibility.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/elementor.module.js?ver=1.2.3' id='fv-player-elementor.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/embed.module.js?ver=1.2.3' id='fv-player-embed.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/fullscreen-fix.module.js?ver=1.2.3' id='fv-player-fullscreen-fix.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/fullscreen-force.module.js?ver=1.2.3' id='fv-player-fullscreen-force.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/hls-audio.module.js?ver=1.2.3' id='fv-player-hls-audio.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/hls-js-fallback.module.js?ver=1.2.3' id='fv-player-hls-js-fallback.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/hls-live-check.module.js?ver=1.2.3' id='fv-player-hls-live-check.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/hls-safari-fixes.module.js?ver=1.2.3' id='fv-player-hls-safari-fixes.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/js-cookie.module.js?ver=1.2.3' id='fv-player-js-cookie.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/keyboard-support.module.js?ver=1.2.3' id='fv-player-keyboard-support.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/live-stream.module.js?ver=1.2.3' id='fv-player-live-stream.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/mailchimp.module.js?ver=1.2.3' id='fv-player-mailchimp.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/mobile.module.js?ver=1.2.3' id='fv-player-mobile.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/multiple-playback.module.js?ver=1.2.3' id='fv-player-multiple-playback.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/old-browsers.module.js?ver=1.2.3' id='fv-player-old-browsers.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/playback-position.module.js?ver=1.2.3' id='fv-player-playback-position.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/playlist-controlbar.module.js?ver=1.2.3' id='fv-player-playlist-controlbar.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/playlist-missing-item.module.js?ver=1.2.3' id='fv-player-playlist-missing-item.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/playlist-repeat.module.js?ver=1.2.3' id='fv-player-playlist-repeat.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/playlist-start-position.module.js?ver=1.2.3' id='fv-player-playlist-start-position.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/repeat-fix.module.js?ver=1.2.3' id='fv-player-repeat-fix.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/s3.module.js?ver=1.2.3' id='fv-player-s3.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/sharing.module.js?ver=1.2.3' id='fv-player-sharing.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/speed-control.module.js?ver=1.2.3' id='fv-player-speed-control.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/speed-restore.module.js?ver=1.2.3' id='fv-player-speed-restore.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/stats.module.js?ver=1.2.3' id='fv-player-stats.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/sticky.module.js?ver=1.2.3' id='fv-player-sticky.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/subtitle-restore.module.js?ver=1.2.3' id='fv-player-subtitle-restore.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/subtitle.module.js?ver=1.2.3' id='fv-player-subtitle.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/video-links.module.js?ver=1.2.3' id='fv-player-video-links.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/volume.module.js?ver=1.2.3' id='fv-player-volume.module.js-js'></script>
-<script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/warning.module.js?ver=1.2.3' id='fv-player-warning.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/fv-player.js?ver=1.2.3' id='fv-player-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/abr-remember.module.js?ver=1.2.3' id='fv-player-abr-remember.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/ad-popup.module.js?ver=1.2.3' id='fv-player-ad-popup.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/analytics.module.js?ver=1.2.3' id='fv-player-analytics.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/appearance.module.js?ver=1.2.3' id='fv-player-appearance.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/audio-player.module.js?ver=1.2.3' id='fv-player-audio-player.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/chromecast.module.js?ver=1.2.3' id='fv-player-chromecast.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/compatibility.module.js?ver=1.2.3' id='fv-player-compatibility.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/elementor.module.js?ver=1.2.3' id='fv-player-elementor.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/embed.module.js?ver=1.2.3' id='fv-player-embed.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/fullscreen-fix.module.js?ver=1.2.3' id='fv-player-fullscreen-fix.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/fullscreen-force.module.js?ver=1.2.3' id='fv-player-fullscreen-force.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/hls-audio.module.js?ver=1.2.3' id='fv-player-hls-audio.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/hls-js-fallback.module.js?ver=1.2.3' id='fv-player-hls-js-fallback.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/hls-live-check.module.js?ver=1.2.3' id='fv-player-hls-live-check.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/hls-safari-fixes.module.js?ver=1.2.3' id='fv-player-hls-safari-fixes.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/js-cookie.module.js?ver=1.2.3' id='fv-player-js-cookie.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/keyboard-support.module.js?ver=1.2.3' id='fv-player-keyboard-support.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/live-stream.module.js?ver=1.2.3' id='fv-player-live-stream.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/mailchimp.module.js?ver=1.2.3' id='fv-player-mailchimp.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/mobile.module.js?ver=1.2.3' id='fv-player-mobile.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/multiple-playback.module.js?ver=1.2.3' id='fv-player-multiple-playback.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/old-browsers.module.js?ver=1.2.3' id='fv-player-old-browsers.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/playback-position.module.js?ver=1.2.3' id='fv-player-playback-position.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/playlist-controlbar.module.js?ver=1.2.3' id='fv-player-playlist-controlbar.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/playlist-missing-item.module.js?ver=1.2.3' id='fv-player-playlist-missing-item.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/playlist-repeat.module.js?ver=1.2.3' id='fv-player-playlist-repeat.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/playlist-start-position.module.js?ver=1.2.3' id='fv-player-playlist-start-position.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/popup-anything.module.js?ver=1.2.3' id='fv-player-popup-anything.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/repeat-fix.module.js?ver=1.2.3' id='fv-player-repeat-fix.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/s3.module.js?ver=1.2.3' id='fv-player-s3.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/sharing.module.js?ver=1.2.3' id='fv-player-sharing.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/speed-control.module.js?ver=1.2.3' id='fv-player-speed-control.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/speed-restore.module.js?ver=1.2.3' id='fv-player-speed-restore.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/stats.module.js?ver=1.2.3' id='fv-player-stats.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/sticky.module.js?ver=1.2.3' id='fv-player-sticky.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/subtitle-restore.module.js?ver=1.2.3' id='fv-player-subtitle-restore.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/subtitle.module.js?ver=1.2.3' id='fv-player-subtitle.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/video-links.module.js?ver=1.2.3' id='fv-player-video-links.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/volume.module.js?ver=1.2.3' id='fv-player-volume.module.js-js'></script>
+<script type='text/javascript' data-fv-player-loader-src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/warning.module.js?ver=1.2.3' id='fv-player-warning.module.js-js'></script>
+<script data-length="9341">"use strict"; (function () { if (window.NodeList && !NodeList.prototype.forEach) { NodeList.prototype.forEach = Array.prototype.forEach; } if (window.HTMLCollection && !HTMLCollection.prototype.forEach) { HTMLCollection.prototype.forEach = Array.prototype.forEach; } var filter = document.createElement('div'); filter.innerHTML = '<svg class="fp-filters" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 0 0"><defs><filter id="f1" x="-20%" y="-20%" width="200%" height="200%"><feOffset result="offOut" in="SourceAlpha" dx="0" dy="0" /><feColorMatrix result="matrixOut" in="offOut" type="matrix" values="0.3 0 0 0 0 0 0.3 0 0 0 0 0 0.3 0 0 0 0 0 0.4 0" /><feGaussianBlur result="blurOut" in="matrixOut" stdDeviation="4" /><feBlend in="SourceGraphic" in2="blurOut" mode="normal" /></filter></defs></svg>'; filter.style.width = 0; filter.style.height = 0; filter.style.overflow = 'hidden'; filter.style.position = 'absolute', filter.style.margin = 0; filter.style.padding = 0; document.body.appendChild(filter); Array.prototype.filter.call(document.getElementsByClassName('flowplayer'), function (player) { player.className = player.className.replace(/\bno-svg\b/g, ''); var admin_js_warning = player.querySelector('.fvfp_admin_error'); if (admin_js_warning) { admin_js_warning.parentNode.removeChild(admin_js_warning); } var preload = player.querySelector('.fp-preload'); if (!preload) return; var parent = preload.parentNode, play_icon = document.createElement('div'); play_icon.className = 'fp-play fp-visible'; play_icon.innerHTML = '<a class="fp-icon fp-playbtn"></a>\ <svg class="fp-play-rounded-fill" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><defs><style>.a{fill:#000;opacity:0.65;}.b{fill:#fff;opacity:1.0;}</style></defs><title>play-rounded-fill</title><path class="fp-color-play" d="M49.9217-.078a50,50,0,1,0,50,50A50.0564,50.0564,0,0,0,49.9217-.078Z"/><path class="b" d="M35.942,35.2323c0-4.7289,3.3506-6.6637,7.446-4.2971L68.83,45.6235c4.0956,2.364,4.0956,6.2319,0,8.5977L43.388,68.91c-4.0954,2.364-7.446.43-7.446-4.2979Z" filter="url(#f1)"/></svg>\ <svg class="fp-play-rounded-outline" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 99.844 99.8434"><defs><style>.fp-color-play{opacity:0.65;}.controlbutton{fill:#fff;}</style></defs><title>play-rounded-outline</title><path class="fp-color-play" d="M49.9217-.078a50,50,0,1,0,50,50A50.0564,50.0564,0,0,0,49.9217-.078Z"/><path class="controlbutton" d="M41.0359,71.19a5.0492,5.0492,0,0,1-2.5575-.6673c-1.8031-1.041-2.7958-3.1248-2.7958-5.8664V35.1887c0-2.7429.9933-4.8272,2.797-5.8676,1.8025-1.0422,4.1034-.86,6.48.5143L70.4782,44.5672c2.3751,1.3711,3.6826,3.2725,3.6832,5.3545s-1.3076,3.9845-3.6832,5.3562L44.9592,70.0114A7.9384,7.9384,0,0,1,41.0359,71.19Zm.0065-40.123a2.6794,2.6794,0,0,0-1.3582.3413c-1.0263.5926-1.5912,1.9349-1.5912,3.78V64.6563c0,1.8449.5649,3.1866,1.5906,3.7791,1.0281.5932,2.4733.4108,4.07-.512L69.273,53.1906c1.5983-.9227,2.478-2.0838,2.478-3.2689s-.88-2.3445-2.478-3.2666L43.754,31.9227A5.5685,5.5685,0,0,0,41.0423,31.0671Z" filter="url(#f1)"/></svg>\ <svg class="fp-play-sharp-fill" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><defs><style>.fp-color-play{opacity:0.65;}.controlbutton{fill:#fff;}</style></defs><title>play-sharp-fill</title><path class="fp-color-play" d="M49.9217-.078a50,50,0,1,0,50,50A50.0564,50.0564,0,0,0,49.9217-.078Z"/><polygon class="controlbutton" points="73.601 50 37.968 70.573 37.968 29.427 73.601 50" filter="url(#f1)"/></svg>\ <svg class="fp-play-sharp-outline" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 99.844 99.8434"><defs><style>.controlbuttonbg{opacity:0.65;}.controlbutton{fill:#fff;}</style></defs><title>play-sharp-outline</title><path class="fp-color-play" d="M49.9217-.078a50,50,0,1,0,50,50A50.0564,50.0564,0,0,0,49.9217-.078Z"/><path class="controlbutton" d="M36.9443,72.2473V27.2916L75.8776,49.77Zm2.2-41.1455V68.4371L71.4776,49.77Z" filter="url(#f1)"/></svg>'.replace(/url\(#/g, 'url(' + window.location.href.replace(window.location.hash, "").replace(/\#$/g, '') + '#'); preload.style.display = 'none'; parent.appendChild(play_icon); }); })(); var FV_Player_JS_Loader_Compatibility_Checker = function () { function FV_Player_JS_Loader_Compatibility_Checker(options) { this.passiveSupported = false; this._checkPassiveOption(this); this.options = this.passiveSupported ? options : false; } var _proto = FV_Player_JS_Loader_Compatibility_Checker.prototype; _proto._checkPassiveOption = function _checkPassiveOption(self) { try { var options = { get passive() { self.passiveSupported = true; return false; } }; window.addEventListener('test', null, options); window.removeEventListener('test', null, options); } catch (err) { self.passiveSupported = false; } }; return FV_Player_JS_Loader_Compatibility_Checker; }(); var FV_Player_JS_Loader = function () { function FV_Player_JS_Loader(triggerEvents, browser) { this.attrName = 'data-fv-player-loader-src'; this.browser = browser; this.options = this.browser.options; this.triggerEvents = triggerEvents; this.userEventListener = this.triggerListener.bind(this); } var _proto2 = FV_Player_JS_Loader.prototype; _proto2.init = function init() { this._addEventListener(this); } ; _proto2.reset = function reset() { this._removeEventListener(this); } ; _proto2._addEventListener = function _addEventListener(self) { this.triggerEvents.forEach(function (eventName) { return window.addEventListener(eventName, self.userEventListener, self.options); }); } ; _proto2._removeEventListener = function _removeEventListener(self) { this.triggerEvents.forEach(function (eventName) { return window.removeEventListener(eventName, self.userEventListener, self.options); }); } ; _proto2._loadScriptSrc = function _loadScriptSrc() { var _this = this; var scripts = document.querySelectorAll("script[" + this.attrName + "]"); window.FV_Player_JS_Loader_scripts_total = 0; window.FV_Player_JS_Loader_scripts_loaded = 0; scripts.forEach(function (elem) { var scriptSrc = elem.getAttribute(_this.attrName); elem.setAttribute('src', scriptSrc); elem.removeAttribute(_this.attrName); window.FV_Player_JS_Loader_scripts_total++; elem.onload = function () { window.FV_Player_JS_Loader_scripts_loaded++; }; }); this.reset(); } ; _proto2.triggerListener = function triggerListener() { Array.prototype.filter.call(document.getElementsByClassName('flowplayer'), function (player) { var preload = player.querySelector('.fp-preload'); if (preload) { preload.style.display = 'block'; } var play = player.querySelector('.fp-play'); if (play) { play.style.display = 'none'; } }); if (window.flowplayer) { this._loadScriptSrc(); } else { var that = this, wait_for_flowplayer = setInterval(function () { if (window.flowplayer) { that._loadScriptSrc(); clearInterval(wait_for_flowplayer); } }, 100); } this._removeEventListener(this); }; FV_Player_JS_Loader.run = function run() { var browser = new FV_Player_JS_Loader_Compatibility_Checker({ passive: true }); var instance = new FV_Player_JS_Loader(['keydown', 'mouseover', 'touchmove', 'touchstart', 'wheel'], browser); instance.init(); if (location.hash.match(/fvp_/)) { instance.triggerListener(); return; } function iOS() { return navigator.platform.match(/iPad|iPhone|iPod/) || navigator.userAgent.indexOf("Mac") !== -1 && "ontouchend" in document; } if (iOS()) { var load_if_any_player_visible = function load_if_any_player_visible() { var is_any_player_visible = false; document.querySelectorAll('.flowplayer').forEach(function (el) { var rect = el.getBoundingClientRect(); if (rect.top >= -el.offsetHeight && rect.left >= -el.offsetWidth && rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) + el.offsetHeight && rect.right <= (window.innerWidth || document.documentElement.clientWidth) + el.offsetWidth) { is_any_player_visible = true; } }); console.log('FV Player: Visible?', is_any_player_visible); if (is_any_player_visible) { instance.triggerListener(); } return is_any_player_visible; }; var was_visible = load_if_any_player_visible(); if (!was_visible) { var load_on_scroll = function load_on_scroll() { this.removeEventListener('scroll', load_on_scroll); load_if_any_player_visible(); }; window.addEventListener('load', load_if_any_player_visible); window.addEventListener('scroll', load_on_scroll); } return; } var first_click_done = false; document.addEventListener('mousedown', function (e) { if (first_click_done) return; first_click_done = true; var playlist_item = false; var path = e.path || e.composedPath && e.composedPath(); path.forEach(function (el) { if (el.getAttribute && el.getAttribute('data-item')) { playlist_item = el; } if (el.className && el.className.match(/\b(flowplayer|fp-playlist-external)\b/)) { document.querySelectorAll('[data-fvautoplay]').forEach(function (player) { player.removeAttribute('data-fvautoplay'); }); if (window.fv_vast_conf) { fv_vast_conf.autoplay = false; } if (el.className.match(/lightbox-starter/)) { } else if (el.className.match(/\bfp-playlist-external\b/)) { console.log('First click on playlist'); var player = document.getElementById(el.getAttribute('rel')); player.setAttribute('data-fvautoplay', Array.prototype.indexOf.call(el.children, playlist_item)); } else { console.log('First click on player'); el.setAttribute('data-fvautoplay', 0); } } }); }, false); }; return FV_Player_JS_Loader; }(); FV_Player_JS_Loader.run();</script>
\ No newline at end of file
diff --git a/test/unit/controller/frontendTest.php b/test/unit/controller/frontendTest.php
index 3db8ce16b..77a5435f7 100644
--- a/test/unit/controller/frontendTest.php
+++ b/test/unit/controller/frontendTest.php
@@ -95,7 +95,8 @@ public function test_flowplayer_prepare_scripts_js_everywhere() {
     
     $expected = "Registering jquery-ui-tabs for ?ver=1.2.3.4 footer? 1
 Registering fv_flowplayer for fv-wordpress-flowplayer/css/flowplayer.css?ver=1.2.3.4
-Registering flowplayer for fv-wordpress-flowplayer/flowplayer/fv-flowplayer.min.js?ver=1.2.3.4 footer? 1
+Registering flowplayer for fv-wordpress-flowplayer/flowplayer/modules/flowplayer.min.js?ver=1.2.3.4 footer? 1
+Registering fv-player for fv-wordpress-flowplayer/flowplayer/fv-player.min.js?ver=1.2.3.4 footer? 1
 Registering flowplayer-hlsjs for fv-wordpress-flowplayer/flowplayer/hls.min.js?ver=1.0.4 footer? 1
 Registering flowplayer-dash for fv-wordpress-flowplayer/flowplayer/flowplayer.dashjs.min.js?ver=1.2.3.4 footer? 1
 Localizing flowplayer with fv_flowplayer_conf = Array