FV Flowplayer Video Player - Version 7.4.33.727

Version Description

2020/08/24 =
Bugfix - Autoplay - hide initial play arrow animation when autoplaying a video did also hide the loading progress indicator
DASH.js library downgrade to 3.0.0 as some videos wouldn't play on macOS 10.5.6 with Safari 13.1.2

Release Info

Developer	FolioVision
Plugin	FV Flowplayer Video Player
Version	7.4.33.727
Comparing to
See all releases

Code changes from version 7.4.24.727 to 7.4.33.727

Files changed (50) hide show

README.md +1 -1
controller/editor.php +1 -1
controller/frontend.php +5 -10
css/admin.css +5 -1
css/flowplayer.css +9 -1
css/s3-browser.css +15 -7
flowplayer.php +5 -2
flowplayer/fv-flowplayer.min.js +1 -1
flowplayer/minify.sh +7 -1
flowplayer/modules/ad-popup.module.js +36 -20
flowplayer/modules/analytics.module.js +3 -0
flowplayer/modules/fv-player.js +21 -2
flowplayer/modules/hls-live-check.module.js +49 -30
flowplayer/modules/keyboard-support.module.js +3 -4
flowplayer/modules/mobile.module.js +3 -1
flowplayer/modules/old-browsers.module.js +6 -0
flowplayer/modules/playback-position.module.js +147 -91
flowplayer/modules/playlist-repeat.module.js +26 -3
flowplayer/modules/sharing.module.js +0 -4
flowplayer/modules/volume.module.js +10 -2
js/digitalocean-spaces-browser.js +48 -0
js/media-library-browser-base.js +8 -2
js/shortcode-editor.js +16 -1
js/video-checker.js +1 -1
languages/fv-wordpress-flowplayer-cs_CZ.mo +0 -0
languages/fv-wordpress-flowplayer-cs_CZ.po +2 -6
languages/fv-wordpress-flowplayer-de_DE.mo +0 -0
languages/fv-wordpress-flowplayer-de_DE.po +2 -6
languages/fv-wordpress-flowplayer-es_ES.mo +0 -0
languages/fv-wordpress-flowplayer-es_ES.po +2 -6
languages/fv-wordpress-flowplayer-sk_SK.mo +0 -0
languages/fv-wordpress-flowplayer-sk_SK.po +2 -6
models/cdn.class.php +192 -0
models/db-video.php +1 -11
models/digitalocean-spaces-browser.class.php +203 -0
models/digitalocean-spaces.class.php +192 -0
models/flowplayer-frontend.php +19 -25
models/flowplayer.php +2 -2
models/media-browser-s3.php +0 -4
models/media-browser.php +8 -5
models/player-position-save.php +47 -10
models/video-intelligence.php +14 -6
readme.txt +19 -1
test/integration/backend/testSettingsScreen.html +5 -5
test/integration/frontend/endActionsTest.php +4 -34
test/integration/frontend/testSimpleShortcode.html +42 -44
test/integration/frontend/videoPositionSavingTest.php +1 -1
test/unit/controller/frontendTest.php +1 -6
view/admin.php +4 -4
view/wizard.php +3 -0

README.md CHANGED Viewed

	@@ -2,7 +2,7 @@
2
3	WordPress's most reliable, easy to use and feature-rich video player. Supports responsive design, HTML5, playlists, ads, stats, Vimeo and YouTube.
4
5	- * Core video engine: open source Flowplayer 6.
6	* Supported video formats are MP4, WebM and OGV ([read about HTML5 video formats](https://foliovision.com/player/encoding)).
7	* Supported video streaming formats are HLS (Flash and JavaScript fallback available for incompatible devices), MPEG DASH and RTMP.
8	* Default options for all the embedded videos can be set in comprehensive administration menu.


2
3	WordPress's most reliable, easy to use and feature-rich video player. Supports responsive design, HTML5, playlists, ads, stats, Vimeo and YouTube.
4
5	+ * Core video engine: open source Flowplayer 7.
6	* Supported video formats are MP4, WebM and OGV ([read about HTML5 video formats](https://foliovision.com/player/encoding)).
7	* Supported video streaming formats are HLS (Flash and JavaScript fallback available for incompatible devices), MPEG DASH and RTMP.
8	* Default options for all the embedded videos can be set in comprehensive administration menu.

controller/editor.php CHANGED Viewed

	@@ -18,7 +18,7 @@ function fv_player_shortcode_editor_scripts_enqueue() {
18	wp_register_script('fvwpflowplayer-domwindow', flowplayer::get_plugin_url().'/js/jquery.colorbox-min.js',array('jquery'), $fv_wp_flowplayer_ver );
19	wp_enqueue_script('fvwpflowplayer-domwindow');
20
21	- wp_register_script('fvwpflowplayer-shortcode-editor', flowplayer::get_plugin_url().'/js/shortcode-editor.js',array('jquery','jquery-ui-sortable'), $fv_wp_flowplayer_ver );
22	wp_register_script('fvwpflowplayer-editor-screenshots', flowplayer::get_plugin_url().'/js/editor-screenshots.js',array('jquery','fvwpflowplayer-shortcode-editor','flowplayer'), $fv_wp_flowplayer_ver );
23
24	wp_localize_script( 'fvwpflowplayer-shortcode-editor', 'fv_player_editor_conf', array(


18	wp_register_script('fvwpflowplayer-domwindow', flowplayer::get_plugin_url().'/js/jquery.colorbox-min.js',array('jquery'), $fv_wp_flowplayer_ver );
19	wp_enqueue_script('fvwpflowplayer-domwindow');
20
21	+ wp_register_script('fvwpflowplayer-shortcode-editor', flowplayer::get_plugin_url().'/js/shortcode-editor.js',array('jquery','jquery-ui-sortable'), $fv_wp_flowplayer_ver.'-fix' );
22	wp_register_script('fvwpflowplayer-editor-screenshots', flowplayer::get_plugin_url().'/js/editor-screenshots.js',array('jquery','fvwpflowplayer-shortcode-editor','flowplayer'), $fv_wp_flowplayer_ver );
23
24	wp_localize_script( 'fvwpflowplayer-shortcode-editor', 'fv_player_editor_conf', array(

controller/frontend.php CHANGED Viewed

	@@ -60,8 +60,7 @@ function fv_flowplayer_get_js_translations() {
60	'video_expired' => __('<h2>Video file expired.<br />Please reload the page and play it again.</h2>', 'fv-wordpress-flowplayer'),
61	'unsupported_format' => __('<h2>Unsupported video format.<br />Please use a Flash compatible device.</h2>','fv-wordpress-flowplayer'),
62	'mobile_browser_detected_1' => __('Mobile browser detected, serving low bandwidth video.','fv-wordpress-flowplayer'),
63	- 'mobile_browser_detected_2' => __('Click here','fv-wordpress-flowplayer'),
64	- 'mobile_browser_detected_3' => __('for full quality.','fv-wordpress-flowplayer'),
65	'live_stream_failed' => __('<h2>Live stream load failed.</h2><h3>Please try again later, perhaps the stream is currently offline.</h3>','fv-wordpress-flowplayer'),
66	'live_stream_failed_2' => __('<h2>Live stream load failed.</h2><h3>Please try again later, perhaps the stream is currently offline.</h3>','fv-wordpress-flowplayer'),
67	'what_is_wrong' => __('Please tell us what is wrong :','fv-wordpress-flowplayer'),
	@@ -326,6 +325,9 @@ function flowplayer_prepare_scripts() {
326
327	if( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) {
328	$path = '/flowplayer/modules/flowplayer.min.js';



329	wp_enqueue_script( 'flowplayer', flowplayer::get_plugin_url().$path, $aDependencies, filemtime( dirname(__FILE__).'/../'.$path ), true );
330	$aDependencies[] = 'flowplayer';
331
	@@ -365,7 +367,7 @@ function flowplayer_prepare_scripts() {
365
366	$aConf['video_hash_links'] = empty($fv_fp->aCurArgs['linking']) ? !$fv_fp->_get_option('disable_video_hash_links' ) : $fv_fp->aCurArgs['linking'] === 'true';
367
368	- if( $sCommercialKey ) $aConf['key'] = $sCommercialKey;
369	if( apply_filters( 'fv_flowplayer_safety_resize', true) && !$fv_fp->_get_option('fixed_size') ) {
370	$aConf['safety_resize'] = true;
371	}
	@@ -460,13 +462,6 @@ function flowplayer_prepare_scripts() {
460	wp_localize_script( 'flowplayer', 'fv_fp_ajaxurl', site_url().'/wp-admin/admin-ajax.php' );
461	wp_localize_script( 'flowplayer', 'fv_flowplayer_playlists', array() ); // has to be defined for FV Player Pro 0.6.20 and such
462
463	- if( count($fv_fp->aAds) > 0 ) { // todo: move into player
464	- wp_localize_script( 'flowplayer', 'fv_flowplayer_ad', $fv_fp->aAds );
465	- }
466	- if( count($fv_fp->aPopups) > 0 ) { // todo: move into player
467	- wp_localize_script( 'flowplayer', 'fv_flowplayer_popup', $fv_fp->aPopups );
468	- }
469	-
470	if( isset($GLOBALS['fv_fp_scripts']) && count($GLOBALS['fv_fp_scripts']) > 0 ) {
471	foreach( $GLOBALS['fv_fp_scripts'] AS $sKey => $aScripts ) {
472	wp_localize_script( 'flowplayer', $sKey.'_array', $aScripts );


60	'video_expired' => __('<h2>Video file expired.<br />Please reload the page and play it again.</h2>', 'fv-wordpress-flowplayer'),
61	'unsupported_format' => __('<h2>Unsupported video format.<br />Please use a Flash compatible device.</h2>','fv-wordpress-flowplayer'),
62	'mobile_browser_detected_1' => __('Mobile browser detected, serving low bandwidth video.','fv-wordpress-flowplayer'),
63	+ 'mobile_browser_detected_2' => __('Click here for full quality','fv-wordpress-flowplayer'),

64	'live_stream_failed' => __('<h2>Live stream load failed.</h2><h3>Please try again later, perhaps the stream is currently offline.</h3>','fv-wordpress-flowplayer'),
65	'live_stream_failed_2' => __('<h2>Live stream load failed.</h2><h3>Please try again later, perhaps the stream is currently offline.</h3>','fv-wordpress-flowplayer'),
66	'what_is_wrong' => __('Please tell us what is wrong :','fv-wordpress-flowplayer'),

325
326	if( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) {
327	$path = '/flowplayer/modules/flowplayer.min.js';
328	+ if( file_exists(dirname(__FILE__).'/../flowplayer/modules/flowplayer.js') ) {
329	+ $path = '/flowplayer/modules/flowplayer.js';
330	+ }
331	wp_enqueue_script( 'flowplayer', flowplayer::get_plugin_url().$path, $aDependencies, filemtime( dirname(__FILE__).'/../'.$path ), true );
332	$aDependencies[] = 'flowplayer';
333

367
368	$aConf['video_hash_links'] = empty($fv_fp->aCurArgs['linking']) ? !$fv_fp->_get_option('disable_video_hash_links' ) : $fv_fp->aCurArgs['linking'] === 'true';
369
370	+ if( $sCommercialKey ) $aConf['key'] = base64_encode($sCommercialKey);
371	if( apply_filters( 'fv_flowplayer_safety_resize', true) && !$fv_fp->_get_option('fixed_size') ) {
372	$aConf['safety_resize'] = true;
373	}

462	wp_localize_script( 'flowplayer', 'fv_fp_ajaxurl', site_url().'/wp-admin/admin-ajax.php' );
463	wp_localize_script( 'flowplayer', 'fv_flowplayer_playlists', array() ); // has to be defined for FV Player Pro 0.6.20 and such
464







465	if( isset($GLOBALS['fv_fp_scripts']) && count($GLOBALS['fv_fp_scripts']) > 0 ) {
466	foreach( $GLOBALS['fv_fp_scripts'] AS $sKey => $aScripts ) {
467	wp_localize_script( 'flowplayer', $sKey.'_array', $aScripts );

css/admin.css CHANGED Viewed

	@@ -108,7 +108,7 @@ table.fv-player-popup-formats td:first-child { width: 72px }
108	display:block;
109	}
110
111	- .fv-metabox-holder .postbox:first-child > .hndle, .fv-metabox-holder .postbox:first-child > .handlediv {
112	display:none;
113	}
114
	@@ -148,6 +148,10 @@ table.fv-player-popup-formats td:first-child { width: 72px }
148
149	/* otherwise "Drag boxes here" appears when you hide a meta box initially and then you show it with JS */
150	.metabox-holder #postbox-container-tab_video_intelligence .empty-container::after { content: none }




151
152	#fv-player-system-info-textarea { font-family: monospace; width: 100%; }
153


108	display:block;
109	}
110
111	+ .fv-metabox-holder .postbox:first-child > .hndle, .fv-metabox-holder .postbox:first-child > .handlediv, .fv-metabox-holder .postbox:first-child > .postbox-header {
112	display:none;
113	}
114

148
149	/* otherwise "Drag boxes here" appears when you hide a meta box initially and then you show it with JS */
150	.metabox-holder #postbox-container-tab_video_intelligence .empty-container::after { content: none }
151	+ /* Disable WordPress 5.5 button to change box order */
152	+ #wpfp_options .handle-order-higher, #wpfp_options .handle-order-lower { display: none }
153	+ /* Disable box dragging */
154	+ #wpfp_options .ui-sortable-handle { cursor: default; pointer-events: none; }
155
156	#fv-player-system-info-textarea { font-family: monospace; width: 100%; }
157

css/flowplayer.css CHANGED Viewed

	@@ -960,7 +960,7 @@
960	.flowplayer.is-splash .fp-ui noscript{display:block;z-index: 1000;position: absolute;left:0;right:0;padding:2em;background:black;margin-top:20%}
961
962	.flowplayer .fp-splash,
963	- .~~entry-content~~ .~~flowplayer~~ .fp-splash {
964	object-fit: contain;
965	height: 100%;
966	width: 100%;
	@@ -972,6 +972,10 @@
972	padding: 0;
973	}
974




975	.flowplayer.skin-slim.is-mouseover.is-ready .fp-ui, .flowplayer.skin-slim.is-paused.is-ready .fp-ui, #content .flowplayer.skin-slim.is-paused.is-ready .fp-ui {
976	background-image: -webkit-gradient(linear, left bottom, left top, from(rgba(0, 0, 0, .25)), color-stop(15%, transparent));
977	background-image: -webkit-linear-gradient(bottom, rgba(0, 0, 0, .25), transparent 15%);
	@@ -2176,3 +2180,7 @@ body.fv_flowplayer_tabs_hide .fv_flowplayer_tabs_content > div.fv_flowplayer_tab
2176	.flowplayer.is-tiny .fv-fp-list {display: none}
2177	.flowplayer .fv-fp-list-menu {width: auto; top:auto}
2178	.flowplayer .fv-fp-list-menu a {text-align:left}


960	.flowplayer.is-splash .fp-ui noscript{display:block;z-index: 1000;position: absolute;left:0;right:0;padding:2em;background:black;margin-top:20%}
961
962	.flowplayer .fp-splash,
963	+ .flowplayer .fp-player .fp-splash {
964	object-fit: contain;
965	height: 100%;
966	width: 100%;

972	padding: 0;
973	}
974
975	+ .flowplayer .fp-message h2:before {
976	+ display: none;
977	+ }
978	+
979	.flowplayer.skin-slim.is-mouseover.is-ready .fp-ui, .flowplayer.skin-slim.is-paused.is-ready .fp-ui, #content .flowplayer.skin-slim.is-paused.is-ready .fp-ui {
980	background-image: -webkit-gradient(linear, left bottom, left top, from(rgba(0, 0, 0, .25)), color-stop(15%, transparent));
981	background-image: -webkit-linear-gradient(bottom, rgba(0, 0, 0, .25), transparent 15%);

2180	.flowplayer.is-tiny .fv-fp-list {display: none}
2181	.flowplayer .fv-fp-list-menu {width: auto; top:auto}
2182	.flowplayer .fv-fp-list-menu a {text-align:left}
2183	+
2184	+ .flowplayer .fp-ui .invisible {
2185	+ visibility: hidden;
2186	+ }

css/s3-browser.css CHANGED Viewed

	@@ -5,10 +5,9 @@
5
6	.attachments-browser .breadcrumbs {
7	color: #000;
8	- font-size: ~~18px~~;
9	font-weight: 700;
10	- ~~line-height~~: ~~35px~~;
11	- margin: 31px 0 0 17px;
12	}
13	.attachments-browser .breadcrumbs a:link, .attachments-browser .breadcrumbs a:visited {
14	color: #000;
	@@ -122,11 +121,16 @@
122	border-radius: 0.25em;
123	color: #FFF;
124	display: block;
125	- margin-top: 0.9em;
126	position: relative;
127	overflow: hidden;
128	box-shadow: 1.74em -2.1em 0 0 #A4A7AC inset;
129	}






130	.attachments-browser .icon.file:first-line {
131	font-size: 13px;
132	font-weight: 700;
	@@ -273,12 +277,16 @@
273	}
274
275	#__assets_browser {
276	- top: ~~55px~~;
277	z-index: 2; /* or a file uploader link will be invisibly over the UL with thumbs */
278	}
279
280	- #~~__assets_browser .attachments-~~browser ~~.s3~~-~~media-toolbar~~ {
281	- ~~height~~: ~~40px !important~~;




282	}
283
284	#__assets_browser .attachments-browser .attachment .thumbnail img {


5
6	.attachments-browser .breadcrumbs {
7	color: #000;
8	+ font-size: 14px;
9	font-weight: 700;
10	+ margin: 50px 0 0 17px;

11	}
12	.attachments-browser .breadcrumbs a:link, .attachments-browser .breadcrumbs a:visited {
13	color: #000;

121	border-radius: 0.25em;
122	color: #FFF;
123	display: block;

124	position: relative;
125	overflow: hidden;
126	box-shadow: 1.74em -2.1em 0 0 #A4A7AC inset;
127	}
128	+ .attachments-browser .attachment-info .thumbnail-image::after {
129	+ box-shadow: none;
130	+ }
131	+ #__assets_browser .icon.file {
132	+ margin-top: 0.9em;
133	+ }
134	.attachments-browser .icon.file:first-line {
135	font-size: 13px;
136	font-weight: 700;

277	}
278
279	#__assets_browser {
280	+ top: 68px;
281	z-index: 2; /* or a file uploader link will be invisibly over the UL with thumbs */
282	}
283
284	+ #browser-dropdown {
285	+ margin-top: 10px;
286	+ }
287	+
288	+ .attachments-browser .s3-media-toolbar {
289	+ height: 50px !important;
290	}
291
292	#__assets_browser .attachments-browser .attachment .thumbnail img {

flowplayer.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	Plugin Name: FV Player
4	Plugin URI: http://foliovision.com/wordpress/plugins/fv-wordpress-flowplayer
5	Description: Formerly FV WordPress Flowplayer. Supports MP4, HLS, MPEG-DASH, WebM and OGV. Advanced features such as overlay ads or popups. Uses Flowplayer 7.2.7.
6	- Version: 7.4.24.727
7	Author URI: http://foliovision.com/
8	License: GPL-3.0
9	License URI: http://www.gnu.org/licenses/gpl-3.0.txt
	@@ -27,7 +27,7 @@ License URI: http://www.gnu.org/licenses/gpl-3.0.txt
27	*/
28
29	global $fv_wp_flowplayer_ver;
30	- $fv_wp_flowplayer_ver = '7.4.24.727';
31	$fv_wp_flowplayer_core_ver = '7.2.7';
32
33	include_once( dirname( __FILE__ ) . '/includes/extra-functions.php' );
	@@ -67,6 +67,9 @@ include_once(dirname( __FILE__ ) . '/models/db-video-meta.php');
67	include_once(dirname( __FILE__ ) . '/models/db-player-meta.php');
68	include_once(dirname( __FILE__ ) . '/models/db.php');
69



70	global $FV_Player_Db;
71	$FV_Player_Db = new FV_Player_Db();
72


3	Plugin Name: FV Player
4	Plugin URI: http://foliovision.com/wordpress/plugins/fv-wordpress-flowplayer
5	Description: Formerly FV WordPress Flowplayer. Supports MP4, HLS, MPEG-DASH, WebM and OGV. Advanced features such as overlay ads or popups. Uses Flowplayer 7.2.7.
6	+ Version: 7.4.33.727
7	Author URI: http://foliovision.com/
8	License: GPL-3.0
9	License URI: http://www.gnu.org/licenses/gpl-3.0.txt

27	*/
28
29	global $fv_wp_flowplayer_ver;
30	+ $fv_wp_flowplayer_ver = '7.4.33.727';
31	$fv_wp_flowplayer_core_ver = '7.2.7';
32
33	include_once( dirname( __FILE__ ) . '/includes/extra-functions.php' );

67	include_once(dirname( __FILE__ ) . '/models/db-player-meta.php');
68	include_once(dirname( __FILE__ ) . '/models/db.php');
69
70	+ include_once(dirname( __FILE__ ).'/models/cdn.class.php');
71	+ include_once(dirname( __FILE__ ).'/models/digitalocean-spaces.class.php');
72	+
73	global $FV_Player_Db;
74	$FV_Player_Db = new FV_Player_Db();
75

flowplayer/fv-flowplayer.min.js CHANGED Viewed

@@ -1 +1 @@

flowplayer/minify.sh CHANGED Viewed

@@ -1,4 +1,10 @@
-            -
            cat modules/flowplayer.min.js > fv-flowplayer.min.dev.js &&
             cat modules/fv-player.js >> fv-flowplayer.min.dev.js &&
             cat modules/*.module.js >> fv-flowplayer.min.dev.js &&
             uglifyjs fv-flowplayer.min.dev.js > fv-flowplayer.min.js &&


1	+ #!/bin/bash
2	+ FILE=modules/flowplayer.js
3	+ if test -f "$FILE"; then
4	+ cat modules/flowplayer.js > fv-flowplayer.min.dev.js
5	+ else
6	+ cat modules/flowplayer.min.js > fv-flowplayer.min.dev.js
7	+ fi
8	cat modules/fv-player.js >> fv-flowplayer.min.dev.js &&
9	cat modules/*.module.js >> fv-flowplayer.min.dev.js &&
10	uglifyjs fv-flowplayer.min.dev.js > fv-flowplayer.min.js &&

flowplayer/modules/ad-popup.module.js CHANGED Viewed

@@ -5,7 +5,7 @@ flowplayer(function (api,root) {
               root = jQuery(root);
               var player_id = root.attr('id'),
                 ad = false;
-            -
               if( root.data('end_popup_preview') ){
                 jQuery(document).ready( function() {
                   api.trigger('finish', [ api] );
@@ -25,28 +25,44 @@ flowplayer(function (api,root) {
+              }
               function show_ad() {
-            -
                if( !ad && !root.hasClass('is-cva') && typeof(fv_flowplayer_ad) != "undefined" && typeof(fv_flowplayer_ad[player_id]) != "undefined" && root.width() >= parseInt(fv_flowplayer_ad[player_id].width) ) {
-            -
                  var html = fv_flowplayer_ad[player_id].html;
-            -
                  html = html.replace( '%random%', Math.random() );
-            -
                  ad = jQuery('<div id="'+player_id+'_ad" class="wpfp_custom_ad">'+html+'</div>');
-            -
                  root.find('.fp-player').append(ad);
-            -
-            -
                  ad_height_check();
-            -
                  // check if the ad contains any video and pause the player if the video is found
-            -
                  setTimeout( function() {
-            -
                    if( root.find('.wpfp_custom_ad video').length ) {
-            -
                      api.pause();
-            -
                    }
-            -
                  },500);
-            -
+                }
+              }
-            -
               function show_popup( event ) {
-            -
                var popup = root.find('.wpfp_custom_popup');
-            -
                if( typeof(fv_flowplayer_popup) != "undefined" && typeof(fv_flowplayer_popup[player_id]) != "undefined" && ( event == 'finish' || fv_flowplayer_popup[player_id].pause || fv_flowplayer_popup[player_id].html.match(/fv-player-ppv-purchase-btn-wrapper/) ) ) {
-            -
                  root.addClass('is-popup-showing');
-            -
                  root.find('.fp-player').append( '<div id="'+player_id+'_custom_popup" class="wpfp_custom_popup">'+fv_flowplayer_popup[player_id].html+'</div>' );
+                }
+              }


5	root = jQuery(root);
6	var player_id = root.attr('id'),
7	ad = false;
8	+
9	if( root.data('end_popup_preview') ){
10	jQuery(document).ready( function() {
11	api.trigger('finish', [ api] );

25	}
26
27	function show_ad() {
28	+ var ad_data = root.attr('data-ad');
29	+ if( typeof(ad_data) !='undefined' && ad_data.length ) {
30	+ try {
31	+ ad_data = JSON.parse(ad_data);
32	+ } catch (e) {
33	+ return false
34	+ }
35	+
36	+ if( !ad && !root.hasClass('is-cva') && root.width() >= parseInt(ad_data.width) ) {
37	+ var html = ad_data.html;
38	+ html = html.replace( '%random%', Math.random() );
39	+ ad = jQuery('<div id="'+player_id+'_ad" class="wpfp_custom_ad">'+html+'</div>');
40	+ root.find('.fp-player').append(ad);
41	+
42	+ ad_height_check();
43	+ // check if the ad contains any video and pause the player if the video is found
44	+ setTimeout( function() {
45	+ if( root.find('.wpfp_custom_ad video').length ) {
46	+ api.pause();
47	+ }
48	+ },500);
49	+ }
50	}
51	}
52	+
53	function show_popup( event ) {
54	+ var popup_data = root.attr('data-popup');
55	+ if( typeof(popup_data) !='undefined' && popup_data.length ) {
56	+ try {
57	+ popup_data = JSON.parse(popup_data);
58	+ } catch (e) {
59	+ return false;
60	+ }
61	+
62	+ if( event == 'finish' \|\| popup_data.pause \|\| popup_data.html.match(/fv-player-ppv-purchase-btn-wrapper/) ) {
63	+ root.addClass('is-popup-showing');
64	+ root.find('.fp-player').append( '<div id="'+player_id+'_custom_popup" class="wpfp_custom_popup">'+popup_data.html+'</div>' );
65	+ }
66	}
67	}
68

flowplayer/modules/analytics.module.js CHANGED Viewed

	@@ -10,6 +10,7 @@ flowplayer( function(api,root) {
10	//return;
11	//}
12	for( var j in fv_ga_events ) {

13	root.removeData('fv_track_'+fv_ga_events[j]);
14	}
15	}).bind('error', function(e,api,error) {
	@@ -45,6 +46,8 @@ flowplayer( function(api,root) {
45	if( root.data('fv_track_'+fv_ga_events[i]) ) return;
46
47	for( var j in fv_ga_events ) { // make sure user triggered the previous quartiles before tracking


48	if(j == i) break;
49	if( !root.data('fv_track_'+fv_ga_events[j]) ) return;
50	}


10	//return;
11	//}
12	for( var j in fv_ga_events ) {
13	+ if( !fv_ga_events.hasOwnProperty(j) ) continue;
14	root.removeData('fv_track_'+fv_ga_events[j]);
15	}
16	}).bind('error', function(e,api,error) {

46	if( root.data('fv_track_'+fv_ga_events[i]) ) return;
47
48	for( var j in fv_ga_events ) { // make sure user triggered the previous quartiles before tracking
49	+ if( !fv_ga_events.hasOwnProperty(j) ) continue;
50	+
51	if(j == i) break;
52	if( !root.data('fv_track_'+fv_ga_events[j]) ) return;
53	}

flowplayer/modules/fv-player.js CHANGED Viewed

	@@ -17,6 +17,11 @@ if( typeof(fv_flowplayer_conf) != "undefined" ) {
17	flowplayer.conf.embed = false;
18	flowplayer.conf.share = false;
19





20	if( !flowplayer.support.android && flowplayer.conf.dacast_hlsjs ) {
21	function FVAbrController(hls) {
22	this.hls = hls;
	@@ -92,7 +97,7 @@ function fv_player_videos_parse(args, root) {
92	fv_fp_mobile = true;
93	}
94	if( fv_fp_mobile ) {
95	- jQuery(root).after('<p class="fv-flowplayer-mobile-switch">'+fv_flowplayer_translations.mobile_browser_detected_1+' <a href="'+document.URL+'?fv_flowplayer_mobile=no">'+fv_flowplayer_translations.mobile_browser_detected_2+'</a~~> '+fv_flowplayer_translations.mobile_browser_detected_3+'</~~p>');
96	}
97	});
98	}
	@@ -520,7 +525,7 @@ function fv_autoplay_init(root, index ,time){
520	}
521	if(root.hasClass('lightboxed')){
522	setTimeout(function(){
523	- jQuery('[href=#' + root.attr('id')+ ']').click();
524	},0);
525	}
526
	@@ -603,6 +608,8 @@ function fv_autoplay_exec(){
603
604	// first play if id is set
605	for( var item in playlist ) {


606	var id = (typeof(playlist[item].id) !== 'undefined') ? fv_parse_sharelink(playlist[item].id.toString()) : false;
607	if( hash === id && autoplay ){
608	console.log('fv_autoplay_exec for '+id,item);
	@@ -613,6 +620,8 @@ function fv_autoplay_exec(){
613	}
614
615	for( var item in playlist ) {


616	var src = fv_parse_sharelink(playlist[item].sources[0].src);
617	if( hash === src && autoplay ){
618	console.log('fv_autoplay_exec for '+src,item);
	@@ -633,6 +642,16 @@ function fv_autoplay_exec(){
633	if( !( ( flowplayer.support.android \|\| flowplayer.support.iOS ) && api && api.conf.clip.sources[0].type == 'video/youtube' ) ) { // don't let these mobile devices autoplay YouTube
634	fv_player_did_autoplay = true;
635	api.load();










636	if(root.data('fvautoplay') == 'muted') {
637	api.mute(true,true);
638	}


17	flowplayer.conf.embed = false;
18	flowplayer.conf.share = false;
19
20	+ // we had a problem that some websites would change the key in HTML if stored as $62\d+
21	+ try {
22	+ flowplayer.conf.key = atob(flowplayer.conf.key);
23	+ } catch(e) {}
24	+
25	if( !flowplayer.support.android && flowplayer.conf.dacast_hlsjs ) {
26	function FVAbrController(hls) {
27	this.hls = hls;

97	fv_fp_mobile = true;
98	}
99	if( fv_fp_mobile ) {
100	+ jQuery(root).after('<p class="fv-flowplayer-mobile-switch">'+fv_flowplayer_translations.mobile_browser_detected_1+' <a href="'+document.URL+'?fv_flowplayer_mobile=no">'+fv_flowplayer_translations.mobile_browser_detected_2+'</a>.</p>');
101	}
102	});
103	}

525	}
526	if(root.hasClass('lightboxed')){
527	setTimeout(function(){
528	+ jQuery('[href=\\#' + root.attr('id')+ ']').click();
529	},0);
530	}
531

608
609	// first play if id is set
610	for( var item in playlist ) {
611	+ if( !playlist.hasOwnProperty(item) ) continue;
612	+
613	var id = (typeof(playlist[item].id) !== 'undefined') ? fv_parse_sharelink(playlist[item].id.toString()) : false;
614	if( hash === id && autoplay ){
615	console.log('fv_autoplay_exec for '+id,item);

620	}
621
622	for( var item in playlist ) {
623	+ if( !playlist.hasOwnProperty(item) ) continue;
624	+
625	var src = fv_parse_sharelink(playlist[item].sources[0].src);
626	if( hash === src && autoplay ){
627	console.log('fv_autoplay_exec for '+src,item);

642	if( !( ( flowplayer.support.android \|\| flowplayer.support.iOS ) && api && api.conf.clip.sources[0].type == 'video/youtube' ) ) { // don't let these mobile devices autoplay YouTube
643	fv_player_did_autoplay = true;
644	api.load();
645	+
646	+ // prevent play arrow and control bar from appearing for a fraction of second for an autoplayed video
647	+ var play_icon = root.find('.fp-play').addClass('invisible'),
648	+ control_bar = root.find('.fp-controls').addClass('invisible');
649	+
650	+ api.one('progress', function() {
651	+ play_icon.removeClass('invisible');
652	+ control_bar.removeClass('invisible');
653	+ });
654	+
655	if(root.data('fvautoplay') == 'muted') {
656	api.mute(true,true);
657	}

flowplayer/modules/hls-live-check.module.js CHANGED Viewed

@@ -13,42 +13,61 @@ flowplayer( function(api,root) {
+              }
               api.on("error", function (e, api, err) {
-            -
                if( !api.conf.clip.live ) return;
-            -
-            -
                var delay = initialDelay;
-            -
                clearInterval(timer);
-            -
                if (err.code === 2 || err.code === 4) {
-            -
                  root.className += " is-offline";
-            -
                  if (flowplayer.support.flashVideo) {
-            -
                    api.one("flashdisabled", function () {
-            -
                      root.querySelector(".fp-flash-disabled").style.display = "none";
-            -
                    });
-            -
                  }
-            -
-            -
                  var messageElement = root.querySelector(".fp-ui .fp-message");
-            -
                  messageElement.innerHTML = "<h2>We are sorry, currently no live stream available.</h2><p>Retrying in <span>" + initialDelay + "</span> seconds ...</p>";
-            -
-            -
                  timer = setInterval(function () {
-            -
                    delay -= 1;
-            -
-            -
                    if (delay && messageElement) {
-            -
                      messageElement.querySelector("span").innerHTML = delay;
-            -
                    } else {
-            -
                      clearInterval(timer);
-            -
                      api.error = api.loading = false;
-            -
                      if (messageElement) {
-            -
                        root.querySelector(".fp-ui").removeChild(messageElement);
-            -
                      }
-            -
                      root.className = root.className.replace(/\bis-(error|offline)\b/g, "");
-            -
                      api.load();
+                    }
-            -
                  }, 1000);
-            -
                }
               });
             });


13	}
14
15	api.on("error", function (e, api, err) {
16	+ setTimeout( function() {
17	+ // whitelisting Vimeo Event URLs used by FV Player Vimeo Live Streaming
18	+ if( !api.conf.clip.live && !api.conf.live && !err.video.src.match(/\/\/vimeo.com\/event\//) ) return;
19	+
20	+ var delay = api.conf.clip.live_starts_in \|\| initialDelay,
21	+ message = api.conf.clip.live_starts_in ? "<h2>Live stream scheduled</h2><p>Starting in <span>" + secondsToDhms(delay) + "</span>.</p>" : "<h2>We are sorry, currently no live stream available.</h2><p>Retrying in <span>" + secondsToDhms(delay) + "</span> seconds ...</p>";
22
23	+ clearInterval(timer);
24
25	+ // 1 occurs in case of FV Player Vimeo Live Streaming
26	+ if (err.code === 1 \|\| err.code === 2 \|\| err.code === 4) {
27	+ root.className += " is-offline";
28
29	+ if (flowplayer.support.flashVideo) {
30	+ api.one("flashdisabled", function () {
31	+ root.querySelector(".fp-flash-disabled").style.display = "none";
32	+ });


















33	}
34	+
35	+ var messageElement = root.querySelector(".fp-ui .fp-message");
36	+ messageElement.innerHTML = message;
37	+
38	+ timer = setInterval(function () {
39	+ delay -= 1;
40
41	+ if (delay > 0 && messageElement) {
42	+ messageElement.querySelector("span").innerHTML = secondsToDhms(delay);
43	+ } else {
44	+ clearInterval(timer);
45	+ api.error = api.loading = false;
46	+ if (messageElement) {
47	+ root.querySelector(".fp-ui").removeChild(messageElement);
48	+ }
49	+ root.className = root.className.replace(/\bis-(error\|offline)\b/g, "");
50	+ api.load();
51	+ }
52	+
53	+ }, 1000);
54	+ }
55	+ },1);
56
57	});
58	+
59	+ function secondsToDhms(seconds) {
60	+ seconds = Number(seconds);
61	+ var d = Math.floor(seconds / (3600*24));
62	+ var h = Math.floor(seconds % (3600*24) / 3600);
63	+ var m = Math.floor(seconds % 3600 / 60);
64	+ var s = Math.floor(seconds % 60);
65	+
66	+ var dDisplay = d > 0 ? d + (d == 1 ? " day, " : " days, ") : "";
67	+ var hDisplay = h > 0 ? h + (h == 1 ? " hour, " : " hours, ") : "";
68	+ var mDisplay = m > 0 ? m + (m == 1 ? " minute and " : " minutes and ") : "";
69	+ var sDisplay = s > 0 ? s + (s == 1 ? " second" : " seconds") : "";
70	+ return dDisplay + hDisplay + mDisplay + sDisplay;
71	+ }
72
73	});

flowplayer/modules/keyboard-support.module.js CHANGED Viewed

	@@ -43,8 +43,9 @@ flowplayer.bean.on(document, "keydown.fp", function(e) {
43	metaKeyPressed = e.ctrlKey \|\| e.metaKey \|\| e.altKey,
44	key = e.which,
45	conf = el && el.conf;
46	-
47	-

48
49	if (!el \|\| !conf.keyboard \|\| el.disabled) return;
50
	@@ -76,8 +77,6 @@ flowplayer.bean.on(document, "keydown.fp", function(e) {
76	// 1, 2, 3, 4 ..
77	if (key < 58 && key > 47) return el.seekTo(key - 48);
78
79	-
80	-
81	switch (key) {
82	case 38: case 75: el.volume(el.volumeLevel + 0.15); break;
83	case 40: case 74: el.volume(el.volumeLevel - 0.15); break;


43	metaKeyPressed = e.ctrlKey \|\| e.metaKey \|\| e.altKey,
44	key = e.which,
45	conf = el && el.conf;
46	+
47	+ // no keybinds when controlbar is disabled or video ad
48	+ if( common.hasClass(focusedRoot, "no-controlbar") \|\| common.hasClass(focusedRoot, "is-cva") ) return;
49
50	if (!el \|\| !conf.keyboard \|\| el.disabled) return;
51

77	// 1, 2, 3, 4 ..
78	if (key < 58 && key > 47) return el.seekTo(key - 48);
79


80	switch (key) {
81	case 38: case 75: el.volume(el.volumeLevel + 0.15); break;
82	case 40: case 74: el.volume(el.volumeLevel - 0.15); break;

flowplayer/modules/mobile.module.js CHANGED Viewed

	@@ -20,13 +20,15 @@ function fv_flowplayer_mobile_switch(id) {
20	}
21	} );
22	if( fv_fp_mobile ) {
23	- jQuery('#wpfp_'+id).after('<p class="fv-flowplayer-mobile-switch">'+fv_flowplayer_translations.mobile_browser_detected_1+' <a href="'+document.URL+'?fv_flowplayer_mobile=no">'+fv_flowplayer_translations.mobile_browser_detected_2+'</a~~> '+fv_flowplayer_translations.mobile_browser_detected_3+'</~~p>');
24	}
25	}
26	}
27
28	if( typeof(fv_flowplayer_mobile_switch_array) != "undefined" ) {
29	for( var i in fv_flowplayer_mobile_switch_array ) {


30	fv_flowplayer_mobile_switch( i );
31	}
32	}


20	}
21	} );
22	if( fv_fp_mobile ) {
23	+ jQuery('#wpfp_'+id).after('<p class="fv-flowplayer-mobile-switch">'+fv_flowplayer_translations.mobile_browser_detected_1+' <a href="'+document.URL+'?fv_flowplayer_mobile=no">'+fv_flowplayer_translations.mobile_browser_detected_2+'</a>.</p>');
24	}
25	}
26	}
27
28	if( typeof(fv_flowplayer_mobile_switch_array) != "undefined" ) {
29	for( var i in fv_flowplayer_mobile_switch_array ) {
30	+ if( !fv_flowplayer_mobile_switch_array.hasOwnProperty(i) ) continue;
31	+
32	fv_flowplayer_mobile_switch( i );
33	}
34	}

flowplayer/modules/old-browsers.module.js CHANGED Viewed

	@@ -6,6 +6,8 @@ function fv_flowplayer_browser_ff_m4v( hash ) {
6
7	if( typeof(fv_flowplayer_browser_ff_m4v_array) != "undefined" ) {
8	for( var i in fv_flowplayer_browser_ff_m4v_array ) {


9	fv_flowplayer_browser_ff_m4v( i );
10	}
11	}
	@@ -31,6 +33,8 @@ function fv_flowplayer_browser_chrome_fail( hash, sAttributes, sVideo, bAutobuff
31
32	if( typeof(fv_flowplayer_browser_chrome_fail_array) != "undefined" ) {
33	for( var i in fv_flowplayer_browser_chrome_fail_array ) {


34	fv_flowplayer_browser_chrome_fail( i, fv_flowplayer_browser_chrome_fail_array[i]['attrs'], fv_flowplayer_browser_chrome_fail_array[i]['mp4'], fv_flowplayer_browser_chrome_fail_array[i]['auto_buffer'] );
35	}
36	}
	@@ -43,6 +47,8 @@ function fv_flowplayer_browser_ie( hash ) {
43
44	if( typeof(fv_flowplayer_browser_ie_array) != "undefined" ) {
45	for( var i in fv_flowplayer_browser_ie_array ) {


46	fv_flowplayer_browser_ie( i );
47	}
48	}


6
7	if( typeof(fv_flowplayer_browser_ff_m4v_array) != "undefined" ) {
8	for( var i in fv_flowplayer_browser_ff_m4v_array ) {
9	+ if( !fv_flowplayer_browser_ff_m4v_array.hasOwnProperty(i) ) continue;
10	+
11	fv_flowplayer_browser_ff_m4v( i );
12	}
13	}

33
34	if( typeof(fv_flowplayer_browser_chrome_fail_array) != "undefined" ) {
35	for( var i in fv_flowplayer_browser_chrome_fail_array ) {
36	+ if( !fv_flowplayer_browser_chrome_fail_array.hasOwnProperty(i) ) continue;
37	+
38	fv_flowplayer_browser_chrome_fail( i, fv_flowplayer_browser_chrome_fail_array[i]['attrs'], fv_flowplayer_browser_chrome_fail_array[i]['mp4'], fv_flowplayer_browser_chrome_fail_array[i]['auto_buffer'] );
39	}
40	}

47
48	if( typeof(fv_flowplayer_browser_ie_array) != "undefined" ) {
49	for( var i in fv_flowplayer_browser_ie_array ) {
50	+ if( !fv_flowplayer_browser_ie_array.hasOwnProperty(i) ) continue;
51	+
52	fv_flowplayer_browser_ie( i );
53	}
54	}

flowplayer/modules/playback-position.module.js CHANGED Viewed

@@ -17,21 +17,55 @@ if (!Date.now) {
                 maxCookieSize = 2500,
                 localStorageEnabled = null,
                 cookieKeyName = 'video_positions',
-            -
                tempCookieKeyName = 'video_positions_tmp',
                 playPositions = [],
                 // retrieves the original source of a video
-            -
                getOriginalSource = function(video) {
                   // logged-in users will have position stored within that video
                   var out = (
                     (typeof(video.sources_original) != "undefined" && typeof(video.sources_original[0]) != "undefined") ?
-            -
                      video.sources_original[0] :
-            -
                      video.sources[0]
                   );
                   // remove all AWS signatures from the path, if an original video URL is not found / present
                   if (typeof(video.sources_original) == "undefined" || typeof(video.sources_original[0]) == "undefined") {
-            -
                    out.src = removeAWSSignatures(out.src);
+                  }
                   return out;
@@ -61,12 +95,9 @@ if (!Date.now) {
                 // called when the video finishes playing - removes that video position from cache, as it's no longer needed
                 removeVideoPosition = function (e, api) {
                   if (api.video.sources) {
-            -
                    if (typeof(playPositions) == 'undefined') {
-            -
                      playPositions = [];
-            -
                    }
-            -
-            -
                    var originalVideoApiPath = getOriginalSource(api.video);
-            -
                    playPositions[originalVideoApiPath.src] = 0;
+                  }
                 },
@@ -93,16 +124,20 @@ if (!Date.now) {
                   postData = [];
                   for (var video_name in playPositions) {
                     // remove all AWS signatures from this video
                     postData.push({
                       name: video_name,
-            -
                      position: playPositions[video_name]
                     });
+                  }
                   if (!postData.length) {
                     // no video positions? remove the temporary position cookie/localStorage data as well
-            -
                    removeCookieKey(tempCookieKeyName);
                     return;
+                  }
@@ -112,36 +147,19 @@ if (!Date.now) {
                       // in case of a page reload, we'll store our last positions into a temporary cookie/localStorage
                       // which will get removed on next page load
                       try {
-            -
                        data = {};
                         // add our video positions
                         for (var i in postData) {
-            -
                          data[postData[i].name] = postData[i].position;
-            -
                        }
-            -
-            -
                        var
-            -
                          serialized = JSON.stringify(data),
-            -
                          dataSize = getTextByteSize(serialized);
-            -
-            -
                        // check if we're not going over maximum cache size
-            -
                        if (dataSize > maxCookieSize) {
-            -
                          // we're over max cache size, let's delete some older videos
-            -
                          while (dataSize > maxCookieSize) {
-            -
                            // remove the first entry only
-            -
                            for (var i in data) {
-            -
                              delete data[i];
-            -
                              // re-serialize with the value removed
-            -
                              serialized = JSON.stringify(data);
-            -
                              // calculate new data size, so we can exit the while loop
-            -
                              dataSize = getTextByteSize(serialized);
-            -
-            -
                              break;
-            -
                            }
-            -
                          }
+                        }
-            -
                        setCookieKey(tempCookieKeyName, serialized);
                       } catch (e) {
                         // JSON JS support missing
                         return;
@@ -179,6 +197,8 @@ if (!Date.now) {
                       // add / edit our video positions
                       for (var i in postData) {
                         data[postData[i].name] = postData[i].position;
+                      }
@@ -192,6 +212,8 @@ if (!Date.now) {
                         while (dataSize > maxCookieSize) {
                           // remove the first entry only
                           for (var i in data) {
                             delete data[i];
                             // re-serialize with the value removed
@@ -217,7 +239,7 @@ if (!Date.now) {
               flowplayer( function(api,root) {
                 var
                   $root = jQuery(root),
-            -
                  enabled = flowplayer.conf.video_position_save_enable || $root.data('save-position'),
                   progressEventsCount = 0,
                   // used to seek into the desired last stored position when he video has started
@@ -225,48 +247,11 @@ if (!Date.now) {
                     if( api.video && api.video.live ) return;
                     var
-            -
                      originalVideoApiPath = getOriginalSource(api.video),
-            -
                      position = originalVideoApiPath.position;
                     api.bind('progress', storeVideoPosition);
-            -
                    // logged-in user, try to seek into a position stored during the last page reload if found,
-            -
                    // since sendBeacon() call might not have arrived into our DB yet
-            -
                    if (flowplayer.conf.is_logged_in == '1') {
-            -
                      var data = getCookieKey(tempCookieKeyName);
-            -
                      if (data && typeof(data) !== 'undefined') {
-            -
                        try {
-            -
                          data = JSON.parse(data);
-            -
-            -
                          if (data[originalVideoApiPath.src]) {
-            -
                            seek(data[originalVideoApiPath.src]);
-            -
-            -
                            // remove the temporary cookie/localStorage data
-            -
                            delete data[originalVideoApiPath.src];
-            -
-            -
                            // check if we have any data left
-            -
                            var stillHasData = false;
-            -
                            for (var i in data) {
-            -
                              stillHasData = true;
-            -
                              break;
-            -
                            }
-            -
-            -
                            if (stillHasData) {
-            -
                              setCookieKey(tempCookieKeyName, JSON.stringify(data));
-            -
                            } else {
-            -
                              removeCookieKey(tempCookieKeyName);
-            -
                            }
-            -
                          }
-            -
-            -
                          // we seeked into the correct position now, let's bail out,
-            -
                          // so the DB value doesn't override this
-            -
                          return;
-            -
                        } catch (e) {
-            -
                          // something went wrong, so the next block will continue
-            -
                        }
-            -
                      }
-            -
                    }
-            -
                     // no temporary positions found, let's work with DB / cookies
                     if (position) {
                       seek(position);
@@ -278,8 +263,8 @@ if (!Date.now) {
                           try {
                             data = JSON.parse(data);
-            -
                            if (data[originalVideoApiPath.src]) {
-            -
                              seek(data[originalVideoApiPath.src]);
+                            }
                           } catch (e) {
                             // something went wrong...
@@ -298,20 +283,11 @@ if (!Date.now) {
+                    }
                     if (api.video.sources) {
-            -
                      if (typeof(playPositions) == 'undefined') {
-            -
                        playPositions = [];
-            -
                      }
-            -
                       var
-            -
                        originalVideoApiPath = getOriginalSource(api.video),
                         position = Math.round(api.video.time);
-            -
                      playPositions[originalVideoApiPath.src] = position;
-            -
-            -
                      // store the new position in the instance itself as well
-            -
                      if (originalVideoApiPath.position) {
-            -
                        originalVideoApiPath.position = position;
-            -
                      }
                       // make a call home every +-30 seconds to make sure a browser crash doesn't affect the position save too much
                       // if (progressEventsCount++ >= sendPositionsEvery) {
@@ -335,6 +311,8 @@ if (!Date.now) {
                     var inPlaylist = false;
                     for (var i in api.conf.playlist) {
                       inPlaylist = true;
                       break;
+                    }
@@ -354,7 +332,47 @@ if (!Date.now) {
                       api.seek(parseInt(position)); // int for Dash.js!
                       clearInterval(do_seek);
                     }, 10 );
-            -
                  };
                 if( !enabled ) return;
@@ -368,6 +386,44 @@ if (!Date.now) {
                   api.bind( 'ready', seekIntoPosition);
+                }
                 // TODO: find out what event can be used to force saving of playlist video positions on video change
                 //api.bind('finish', forceSavePosition);
               });


17	maxCookieSize = 2500,
18	localStorageEnabled = null,
19	cookieKeyName = 'video_positions',
20	+ tempPositionCookieKeyName = 'video_positions_tmp',
21	+ tempSawCookieKeyName = 'video_saw_tmp',
22	playPositions = [],
23	+ sawVideo = [],
24	+
25	+ getSerialized = function(data) {
26	+ var
27	+ serialized = JSON.stringify(data),
28	+ dataSize = getTextByteSize(serialized);
29	+
30	+ // check if we're not going over maximum cache size
31	+ if (dataSize > maxCookieSize) {
32	+ // we're over max cache size, let's delete some older videos
33	+ while (dataSize > maxCookieSize) {
34	+ // remove the first entry only
35	+ for (var i in data) {
36	+ if( !data.hasOwnProperty(i) ) continue;
37	+
38	+ delete data[i];
39	+
40	+ // re-serialize with the value removed
41	+ serialized = JSON.stringify(data);
42	+ // calculate new data size, so we can exit the while loop
43	+ dataSize = getTextByteSize(serialized);
44	+
45	+ break;
46	+ }
47	+ }
48	+ }
49	+
50	+ return serialized;
51	+ },
52
53	// retrieves the original source of a video
54	+ getVideoId = function(video) {
55	+ if( video.id ) {
56	+ return video.id;
57	+ }
58	+
59	// logged-in users will have position stored within that video
60	var out = (
61	(typeof(video.sources_original) != "undefined" && typeof(video.sources_original[0]) != "undefined") ?
62	+ video.sources_original[0].src :
63	+ video.sources[0].src
64	);
65
66	// remove all AWS signatures from the path, if an original video URL is not found / present
67	if (typeof(video.sources_original) == "undefined" \|\| typeof(video.sources_original[0]) == "undefined") {
68	+ out = removeAWSSignatures(out);
69	}
70
71	return out;

95	// called when the video finishes playing - removes that video position from cache, as it's no longer needed
96	removeVideoPosition = function (e, api) {
97	if (api.video.sources) {
98	+ var video_id = getVideoId(api.video);
99	+ playPositions[video_id] = 0;
100	+ sawVideo[video_id] = 1;



101	}
102	},
103

124	postData = [];
125
126	for (var video_name in playPositions) {
127	+ if( !playPositions.hasOwnProperty(video_name) ) continue;
128	+
129	// remove all AWS signatures from this video
130	postData.push({
131	name: video_name,
132	+ position: playPositions[video_name],
133	+ saw: typeof(sawVideo[video_name]) != "undefined" ? sawVideo[video_name] : false
134	});
135	}
136
137	if (!postData.length) {
138	// no video positions? remove the temporary position cookie/localStorage data as well
139	+ removeCookieKey(tempPositionCookieKeyName);
140	+ removeCookieKey(tempSawCookieKeyName);
141	return;
142	}
143

147	// in case of a page reload, we'll store our last positions into a temporary cookie/localStorage
148	// which will get removed on next page load
149	try {
150	+ var temp_position_data = {},
151	+ temp_saw_data = {};
152
153	// add our video positions
154	for (var i in postData) {
155	+ if( !postData.hasOwnProperty(i) ) continue;













156
157	+ temp_position_data[postData[i].name] = postData[i].position;
158	+ temp_saw_data[postData[i].name] = postData[i].saw;






159	}
160
161	+ setCookieKey(tempPositionCookieKeyName, getSerialized(temp_position_data));
162	+ setCookieKey(tempSawCookieKeyName, getSerialized(temp_saw_data));
163	} catch (e) {
164	// JSON JS support missing
165	return;

197
198	// add / edit our video positions
199	for (var i in postData) {
200	+ if( !postData.hasOwnProperty(i) ) continue;
201	+
202	data[postData[i].name] = postData[i].position;
203	}
204

212	while (dataSize > maxCookieSize) {
213	// remove the first entry only
214	for (var i in data) {
215	+ if( !data.hasOwnProperty(i) ) continue;
216	+
217	delete data[i];
218
219	// re-serialize with the value removed

239	flowplayer( function(api,root) {
240	var
241	$root = jQuery(root),
242	+ enabled = flowplayer.conf.video_position_save_enable && $root.data('save-position') != 'false' \|\| $root.data('save-position'),
243	progressEventsCount = 0,
244
245	// used to seek into the desired last stored position when he video has started

247	if( api.video && api.video.live ) return;
248
249	var
250	+ video_id = getVideoId(api.video),
251	+ position = api.video.position;
252
253	api.bind('progress', storeVideoPosition);
254





































255	// no temporary positions found, let's work with DB / cookies
256	if (position) {
257	seek(position);

263	try {
264	data = JSON.parse(data);
265
266	+ if (data[video_id]) {
267	+ seek(data[video_id]);
268	}
269	} catch (e) {
270	// something went wrong...

283	}
284
285	if (api.video.sources) {




286	var
287	+ video_id = getVideoId(api.video),
288	position = Math.round(api.video.time);
289
290	+ playPositions[video_id] = position;





291
292	// make a call home every +-30 seconds to make sure a browser crash doesn't affect the position save too much
293	// if (progressEventsCount++ >= sendPositionsEvery) {

311	var inPlaylist = false;
312
313	for (var i in api.conf.playlist) {
314	+ if( !api.conf.playlist.hasOwnProperty(i) ) continue;
315	+
316	inPlaylist = true;
317	break;
318	}

332	api.seek(parseInt(position)); // int for Dash.js!
333	clearInterval(do_seek);
334	}, 10 );
335	+ },
336	+
337	+ processTempData = function(temp_data_name, video_id) {
338	+ var data = getCookieKey(temp_data_name),
339	+ output = false;
340	+ if (data && typeof(data) !== 'undefined') {
341	+ try {
342	+ data = JSON.parse(data);
343	+
344	+ if ( typeof(data[video_id]) != "undefined" ) {
345	+ output = data[video_id];
346	+
347	+ // remove the temporary cookie/localStorage data
348	+ delete data[video_id];
349	+
350	+ // check if we have any data left
351	+ var stillHasData = false;
352	+ for (var i in data) {
353	+ if( !data.hasOwnProperty(i) ) continue;
354	+
355	+ stillHasData = true;
356	+ break;
357	+ }
358	+
359	+ if (stillHasData) {
360	+ setCookieKey(temp_data_name, JSON.stringify(data));
361	+ } else {
362	+ removeCookieKey(temp_data_name);
363	+ }
364	+ }
365	+
366	+ // we seeked into the correct position now, let's bail out,
367	+ // so the DB value doesn't override this
368	+ return output;
369	+ } catch (e) {
370	+ // something went wrong, so the next block will continue
371	+ }
372	+ }
373	+ }
374	+
375	+
376
377	if( !enabled ) return;
378

386	api.bind( 'ready', seekIntoPosition);
387	}
388
389	+ // Check all the playlist items to see if any of them has the temporary "position" or "saw" cookie set
390	+ if (flowplayer.conf.is_logged_in == '1') {
391	+ var playlist = api.conf.playlist.length > 0 ? api.conf.playlist : [ api.conf.clip ];
392	+ for( var i in playlist ) {
393	+ if (!playlist.hasOwnProperty(i)) continue;
394	+
395	+ var video_id = getVideoId(playlist[i]),
396	+ position = processTempData(tempPositionCookieKeyName,video_id),
397	+ saw = processTempData(tempSawCookieKeyName,video_id);
398	+
399	+ if( position ) {
400	+ if( api.conf.playlist.length ) {
401	+ api.conf.playlist[i].sources[0].position = position;
402	+ } else {
403	+ api.conf.clip.sources[0].position = position;
404	+ }
405	+ }
406	+
407	+ if( saw ) {
408	+ if( api.conf.playlist.length ) {
409	+ api.conf.playlist[i].sources[0].saw = true;
410	+ } else {
411	+ api.conf.clip.sources[0].saw = true;
412	+ }
413	+ }
414	+ }
415	+
416	+ }
417	+
418	+ // store saw after finish
419	+ api.bind('finish', function (e, api) {
420	+ if( api.conf.playlist.length ) {
421	+ api.conf.playlist[api.video.index].sources[0].saw = true;
422	+ } else {
423	+ api.conf.clip.sources[0].saw = true;
424	+ }
425	+ });
426	+
427	// TODO: find out what event can be used to force saving of playlist video positions on video change
428	//api.bind('finish', forceSavePosition);
429	});

flowplayer/modules/playlist-repeat.module.js CHANGED Viewed

	@@ -142,17 +142,17 @@ flowplayer( function(api,root) {
142	e.preventDefault();
143	e.stopPropagation();
144


145	if( api.video.loop ) {
146	api.video.loop = false;
147	- jQuery(this).removeClass('is-active fp-color-fill');
148	} else {
149	api.video.loop = true;
150	- jQuery(this).addClass('is-active fp-color-fill');
151	}
152	});
153
154	if( api.conf.loop ) {
155	- button_track_repeat.~~click~~();
156	}
157
158	}
	@@ -170,10 +170,33 @@ flowplayer( function(api,root) {
170
171	button_rewind.toggle(!api.video.live);
172	}






















173	}).bind('unload', function() {
174	root.find('.fv-fp-no-picture').remove();
175	root.find('.fv-fp-playlist').remove();
176	root.find('.fv-fp-track-repeat').remove();

177	});
178
179	function array_shuffle(a) {


142	e.preventDefault();
143	e.stopPropagation();
144
145	+ jQuery(this).toggleClass('is-active fp-color-fill',api.video.loop);
146	+
147	if( api.video.loop ) {
148	api.video.loop = false;

149	} else {
150	api.video.loop = true;

151	}
152	});
153
154	if( api.conf.loop ) {
155	+ button_track_repeat.addClass('is-active fp-color-fill');
156	}
157
158	}

170
171	button_rewind.toggle(!api.video.live);
172	}
173	+
174	+ // Fix for an unfortunate bug in Flowplayer 7.2.5 and later when using MP4 of Hls.js (html5factory)
175	+ // This is because Flowplayer tried to retain the paused state when seeking after finish: https://github.com/flowplayer/flowplayer/blob/d5b70e7a40518582287d9b73aa76ea568c948816/lib/engine/html5-factory.js#L186
176	+ // So then the video loop code won't work: https://github.com/flowplayer/flowplayer/blob/922c21346f1375eac0782ede472dc65e61e95eac/lib/ext/playlist.js#L41
177	+
178	+ // So, once the video finishes
179	+ }).bind('finish', function() {
180	+ var finished_at = api.video.time;
181	+
182	+ // ...and it's set to loop
183	+ if( api.video.loop ) {
184	+
185	+ // ...and it's paused
186	+ api.one('pause', function() {
187	+ /// ...and it's paused right there, even before seeking to the actual loop position
188	+ if( finished_at <= api.video.time ) {
189	+ // ...we force resume the video
190	+ api.resume();
191	+ }
192	+ });
193	+ }
194	+
195	}).bind('unload', function() {
196	root.find('.fv-fp-no-picture').remove();
197	root.find('.fv-fp-playlist').remove();
198	root.find('.fv-fp-track-repeat').remove();
199	+
200	});
201
202	function array_shuffle(a) {

flowplayer/modules/sharing.module.js CHANGED Viewed

	@@ -14,10 +14,6 @@ flowplayer( function(api,root) {
14	});
15	}
16
17	- if( root.data('fv_loop') ) {
18	- api.conf.loop = true;
19	- }
20	-
21	jQuery('.fvfp_admin_error', root).remove();
22
23	root.find('.fp-logo, .fp-header').click( function(e) {


14	});
15	}
16




17	jQuery('.fvfp_admin_error', root).remove();
18
19	root.find('.fp-logo, .fp-header').click( function(e) {

flowplayer/modules/volume.module.js CHANGED Viewed

	@@ -11,7 +11,7 @@ flowplayer(function(api, root) {
11	var restore = -1;
12
13	// Restore volume on click
14	- root.on('click','.fp-~~volume~~', function(e) {
15	if(api.volumeLevel == 0 && restore != -1) {
16	api.volume(restore);
17	return false;
	@@ -21,12 +21,20 @@ flowplayer(function(api, root) {
21	// Click into volume bar and start dragging it down and drag it to very 0, it would remember the initial volume - the one which was there on mousedown
22	// Other case is click into the volume bar and drag it from 1 to about 0.5. So 0.5 is remembered on mouseup, then drag it to 0. So clicking the mute icon would restore to 0.5
23	// It's not so ideal with touchstart and touchend, it seems to remember some weird volume which user didn't intendt to set, but nothing too critical
24	- root.on('mousedown touchstart mouseup touchend','.fp-~~volume~~', function(e) {
25	if ( api.volumeLevel != 0 ) {
26	restore = api.volumeLevel;
27	}
28	})
29








30	// Mute
31	api.on('volume', function(e,api) {
32	if( root.hasClass('is-mouseover') && !api.muted ) {


11	var restore = -1;
12
13	// Restore volume on click
14	+ root.on('click','.fp-volumebtn', function(e) {
15	if(api.volumeLevel == 0 && restore != -1) {
16	api.volume(restore);
17	return false;

21	// Click into volume bar and start dragging it down and drag it to very 0, it would remember the initial volume - the one which was there on mousedown
22	// Other case is click into the volume bar and drag it from 1 to about 0.5. So 0.5 is remembered on mouseup, then drag it to 0. So clicking the mute icon would restore to 0.5
23	// It's not so ideal with touchstart and touchend, it seems to remember some weird volume which user didn't intendt to set, but nothing too critical
24	+ root.on('mousedown touchstart mouseup touchend','.fp-volumebar', function(e) {
25	if ( api.volumeLevel != 0 ) {
26	restore = api.volumeLevel;
27	}
28	})
29
30	+ // When muting with the button forget about the volume to restore
31	+ // As otherwise the root.on('click','.fp-volumebtn', ... ) handler above would restore the volume
32	+ root.on('mousedown touchstart','.fp-volumebtn', function(e) {
33	+ if( api.volumeLevel > 0 ) {
34	+ restore = -1;
35	+ }
36	+ });
37	+
38	// Mute
39	api.on('volume', function(e,api) {
40	if( root.hasClass('is-mouseover') && !api.muted ) {

js/digitalocean-spaces-browser.js ADDED Viewed

	@@ -0,0 +1,48 @@


1	+ jQuery( function($) {
2	+
3	+ function fv_flowplayer_dos_browser_load_assets(bucket, path) {
4	+ var
5	+ $this = jQuery(this),
6	+ $media_frame_content = jQuery('.media-frame-content:visible'),
7	+ $overlay_div = jQuery('#fv-player-shortcode-editor-preview-spinner').clone().css({
8	+ 'height': '100%'
9	+ }),
10	+ ajax_data = {
11	+ action: "load_dos_assets",
12	+ };
13	+
14	+ $this.addClass('active').siblings().removeClass('active');
15	+
16	+ // replace content by the new DOS content
17	+ $media_frame_content.html($overlay_div);
18	+
19	+ if (typeof bucket === 'string' && bucket) {
20	+ ajax_data['bucket'] = bucket;
21	+ }
22	+ if (typeof path === 'string' && path) {
23	+ ajax_data['path'] = path;
24	+ }
25	+
26	+ jQuery.post(ajaxurl, ajax_data, function (ret) {
27	+ var renderOptions = {};
28	+
29	+ // add errors, if any
30	+ if (ret.err) {
31	+ renderOptions['errorMsg'] = ret.err;
32	+ }
33	+
34	+ $media_frame_content.html(renderBrowserPlaceholderHTML(renderOptions));
35	+
36	+ // hide search, as it's not supported for DOS
37	+ jQuery('#media-search-input').parent().hide();
38	+
39	+ fv_flowplayer_browser_browse(ret.items, { 'breadcrumbs' : 1 });
40	+ });
41	+
42	+ return false;
43	+ };
44	+
45	+ $(document).on("mediaBrowserOpen", function (event) {
46	+ fv_flowplayer_media_browser_add_tab('fv_flowplayer_dos_browser_media_tab', 'DigitalOcean Spaces', fv_flowplayer_dos_browser_load_assets);
47	+ });
48	+ });

js/media-library-browser-base.js CHANGED Viewed

	@@ -390,7 +390,7 @@ jQuery( function($) {
390	return link;
391	}
392
393	- function getSplashImageForMediaFileHref(href) {
394	var find = [ fileGetBase(href) ];
395	if( window.fv_player_shortcode_editor_qualities ) {
396	Object.keys(fv_player_shortcode_editor_qualities).forEach( function(prefix) {
	@@ -407,6 +407,12 @@ jQuery( function($) {
407	var f = fv_flowplayer_scannedFiles[j];
408	if( f.link.match(/\.(jpg\|jpeg\|png\|gif)$/) && fileGetBase(f.link) == find[i] && f.link != href ) {
409	splash = (f.splash ? f.splash : f.link);






410	}
411	}
412	}
	@@ -418,7 +424,7 @@ jQuery( function($) {
418	var
419	$url_input = jQuery('.fv_flowplayer_target'),
420	$popup_close_btn = jQuery('.media-modal-close:visible'),
421	- splash = getSplashImageForMediaFileHref(href);
422
423	$url_input
424	.val(href)


390	return link;
391	}
392
393	+ function getSplashImageForMediaFileHref(href, strip_signature) {
394	var find = [ fileGetBase(href) ];
395	if( window.fv_player_shortcode_editor_qualities ) {
396	Object.keys(fv_player_shortcode_editor_qualities).forEach( function(prefix) {

407	var f = fv_flowplayer_scannedFiles[j];
408	if( f.link.match(/\.(jpg\|jpeg\|png\|gif)$/) && fileGetBase(f.link) == find[i] && f.link != href ) {
409	splash = (f.splash ? f.splash : f.link);
410	+
411	+ // remove signature if we're updating the Editor field, otherwise leave it in,
412	+ // so we can actually preview the splash
413	+ if (strip_signature && splash.indexOf('?') > -1) {
414	+ splash = splash.substring(0, splash.indexOf('?'));
415	+ }
416	}
417	}
418	}

424	var
425	$url_input = jQuery('.fv_flowplayer_target'),
426	$popup_close_btn = jQuery('.media-modal-close:visible'),
427	+ splash = getSplashImageForMediaFileHref(href, true);
428
429	$url_input
430	.val(href)

js/shortcode-editor.js CHANGED Viewed

	@@ -1239,7 +1239,7 @@ function fv_wp_flowplayer_edit() {
1239	var caps = real_val.charAt(0).toUpperCase() + real_val.slice(1);
1240	$element.find('option').each(function() {
1241	if (this.text == caps) {
1242	- ~~jQuery(this)~~.~~attr~~(~~'selected', 'selected'~~);
1243	}
1244	});
1245	}
	@@ -1388,6 +1388,21 @@ function fv_wp_flowplayer_edit() {
1388
1389	// rename insert to update if we're actually editing
1390	jQuery('.fv_player_field_insert-button').val('Update');















1391	}
1392
1393	fv_wp_flowplayer_big_loader_close();


1239	var caps = real_val.charAt(0).toUpperCase() + real_val.slice(1);
1240	$element.find('option').each(function() {
1241	if (this.text == caps) {
1242	+ $element.val(caps);
1243	}
1244	});
1245	}

1388
1389	// rename insert to update if we're actually editing
1390	jQuery('.fv_player_field_insert-button').val('Update');
1391	+
1392	+ // hotfix:
1393	+ // make sure the width and height inputs are in sync and have the correct value,
1394	+ // as we have duplicate fields for them in 2 places (video tab and options tab)
1395	+ // and if there is only a single video, the video tab takes precedence,
1396	+ // otherwise it's the options tab
1397	+ if ( jQuery('.fv-player-tab-playlist table .ui-sortable-handle').length > 1) {
1398	+ // multiple videos playlist, options tab values must be filled-in
1399	+ jQuery('.fv-player-tab-options .fv_wp_flowplayer_field_width').val(response.width);
1400	+ jQuery('.fv-player-tab-options .fv_wp_flowplayer_field_height').val(response.height)
1401	+ } else {
1402	+ // single video playlist, video tab values must be filled-in
1403	+ jQuery('.fv-player-tab-video-files .fv_wp_flowplayer_field_width').val(response.width);
1404	+ jQuery('.fv-player-tab-video-files .fv_wp_flowplayer_field_height').val(response.height);
1405	+ }
1406	}
1407
1408	fv_wp_flowplayer_big_loader_close();

js/video-checker.js CHANGED Viewed

	@@ -158,7 +158,7 @@
158	return;
159	}
160
161	- } ).~~error~~(function() {
162	if( /MSIE 9/i.test(navigator.userAgent) ){
163	jQuery('#wpfp_notice_'+hash).html('<p>'+fv_flowplayer_translations.no_support_IE9+'</p>');
164	} else {


158	return;
159	}
160
161	+ } ).fail(function() {
162	if( /MSIE 9/i.test(navigator.userAgent) ){
163	jQuery('#wpfp_notice_'+hash).html('<p>'+fv_flowplayer_translations.no_support_IE9+'</p>');
164	} else {

languages/fv-wordpress-flowplayer-cs_CZ.mo CHANGED Viewed

Binary file

languages/fv-wordpress-flowplayer-cs_CZ.po CHANGED Viewed

	@@ -169,12 +169,8 @@ msgid "Mobile browser detected, serving low bandwidth video."
169	msgstr "Zjištěn mobilní přohližeč, spúštění videa s malou šírkou pásma."
170
171	#: ../controller/frontend.php:64
172	- msgid "Click here"
173	- msgstr "Klikni sem"
174	-
175	- #: ../controller/frontend.php:65
176	- msgid "for full quality."
177	- msgstr "pro plnou kvalitu"
178
179	#: ../controller/frontend.php:66 ../controller/frontend.php:67
180	msgid ""


169	msgstr "Zjištěn mobilní přohližeč, spúštění videa s malou šírkou pásma."
170
171	#: ../controller/frontend.php:64
172	+ msgid "Click here for full quality"
173	+ msgstr "Klikni sem pro plnou kvalitu"




174
175	#: ../controller/frontend.php:66 ../controller/frontend.php:67
176	msgid ""

languages/fv-wordpress-flowplayer-de_DE.mo CHANGED Viewed

Binary file

languages/fv-wordpress-flowplayer-de_DE.po CHANGED Viewed

	@@ -167,12 +167,8 @@ msgstr ""
167	"Mobiler Browser erkannt, Video wird mit geringer Bandbreite abgespielt."
168
169	#: controller/frontend.php:64
170	- msgid "Click here"
171	- msgstr "Hier klicken"
172	-
173	- #: controller/frontend.php:65
174	- msgid "for full quality."
175	- msgstr "für hohe Qualität."
176
177	#: controller/frontend.php:66 controller/frontend.php:67
178	msgid ""


167	"Mobiler Browser erkannt, Video wird mit geringer Bandbreite abgespielt."
168
169	#: controller/frontend.php:64
170	+ msgid "Click here for full quality"
171	+ msgstr "Hier klicken für hohe Qualität"




172
173	#: controller/frontend.php:66 controller/frontend.php:67
174	msgid ""

languages/fv-wordpress-flowplayer-es_ES.mo CHANGED Viewed

Binary file

languages/fv-wordpress-flowplayer-es_ES.po CHANGED Viewed

	@@ -170,12 +170,8 @@ msgstr ""
170	"Navegador móvil detectado, reproducción de vídeo de ancho de banda bajo."
171
172	#: ../controller/frontend.php:64
173	- msgid "Click here"
174	- msgstr "Haz clic aquí"
175	-
176	- #: ../controller/frontend.php:65
177	- msgid "for full quality."
178	- msgstr "para una calidad total."
179
180	#: ../controller/frontend.php:66 ../controller/frontend.php:67
181	msgid ""


170	"Navegador móvil detectado, reproducción de vídeo de ancho de banda bajo."
171
172	#: ../controller/frontend.php:64
173	+ msgid "Click here for full quality"
174	+ msgstr "Haz clic aquí para una calidad total"




175
176	#: ../controller/frontend.php:66 ../controller/frontend.php:67
177	msgid ""

languages/fv-wordpress-flowplayer-sk_SK.mo CHANGED Viewed

Binary file

languages/fv-wordpress-flowplayer-sk_SK.po CHANGED Viewed

	@@ -165,12 +165,8 @@ msgid "Mobile browser detected, serving low bandwidth video."
165	msgstr "Mobilný telefón prehráva video so zníženou kvalitou."
166
167	#: controller/frontend.php:64
168	- msgid "Click here"
169	- msgstr "Kliknite sem"
170	-
171	- #: controller/frontend.php:65
172	- msgid "for full quality."
173	- msgstr "pre plnú kvalitu."
174
175	#: controller/frontend.php:66 controller/frontend.php:67
176	msgid ""


165	msgstr "Mobilný telefón prehráva video so zníženou kvalitou."
166
167	#: controller/frontend.php:64
168	+ msgid "Click here for full quality"
169	+ msgstr "Kliknite sem pre plnú kvalitu"




170
171	#: controller/frontend.php:66 controller/frontend.php:67
172	msgid ""

models/cdn.class.php ADDED Viewed

	@@ -0,0 +1,192 @@


1	+ <?php
2	+
3	+ if( !class_exists('FV_Player_CDN') ) :
4	+
5	+ abstract class FV_Player_CDN {
6	+
7	+ var $aDomains;
8	+
9	+ var $aSecureTokens;
10	+
11	+ var $key = false;
12	+
13	+ var $title = false;
14	+
15	+ function __construct( $args ) {
16	+ if( !empty($args['key']) ) $this->key = $args['key'];
17	+ if( !empty($args['title']) ) $this->title = $args['title'];
18	+
19	+ if( !$this->aDomains && !$this->aSecureTokens ) {
20	+ // we use priority 21 to make sure it's after any FV_Player_Pro_Ajax_Loader::register_meta_boxes()
21	+ add_action( 'admin_init', array( $this, 'register_meta_boxes' ), 21 );
22	+ }
23	+ add_filter( 'plugins_loaded', array( $this, 'load_options' ), 8 );
24	+ }
25	+
26	+
27	+ /*
28	+ * Used by FV Player Pro
29	+ */
30	+ function ajax() {
31	+ if( isset($_POST['action']) && $_POST['action'] == 'fv_fp_get_video_url' ) {
32	+ $bFound = false;
33	+ foreach( $this->aDomains AS $i => $sDomains ) {
34	+ $aDomains = explode(',',$sDomains);
35	+ foreach( $aDomains AS $sDomain ) {
36	+ foreach( $_POST['sources'] AS $key => $aVideo ) {
37	+ if( !isset($aVideo['src']) \|\| !isset($aVideo['type']) ) continue;
38	+
39	+ if( stripos($aVideo['src'],$sDomain) !== false ) {
40	+ $bFound = true;
41	+ $aVideo['src'] = $this->secure_link($aVideo['src'],$this->aSecureTokens[$i]);
42	+ $_POST['sources'][$key] = $aVideo;
43	+ }
44	+ }
45	+ }
46	+ }
47	+
48	+ if( $bFound ) {
49	+ echo '<FVFLOWPLAYER>';
50	+ echo json_encode($_POST['sources']);
51	+ echo '</FVFLOWPLAYER>';
52	+ die();
53	+ }
54	+ }
55	+
56	+ }
57	+
58	+
59	+ function args( $args ) {
60	+ // add the query arg you use in URL into this array
61	+ return $args;
62	+ }
63	+
64	+
65	+ function domains( $aDomains ) {
66	+ foreach( $this->aDomains AS $sDomains ) {
67	+ $aTemp = explode(',',$sDomains);
68	+ foreach( $aTemp AS $sDomain ) {
69	+ if( $sDomain ) $aDomains[] = $sDomain;
70	+ }
71	+ }
72	+
73	+ return $aDomains;
74	+ }
75	+
76	+
77	+ function get_signed_url( $url, $args, $ttl = false ) {
78	+ // either there is no FV_Player_Pro_Ajax_Loader from FV Player Pro or it's a back-end request for signed file URL
79	+ if( !class_exists('FV_Player_Pro_Ajax_Loader') \|\| is_array($args) && isset($args['dynamic']) && $args['dynamic'] ) {
80	+ $bFound = false;
81	+ foreach( $this->aDomains AS $i => $sDomains ) {
82	+ $aDomains = explode(',',$sDomains);
83	+ foreach( $aDomains AS $sDomain ) {
84	+ if( stripos($url,$sDomain) !== false ) {
85	+ $bFound = true;
86	+
87	+
88	+ global $fv_fp, $post;
89	+ if( !empty($fv_fp) && method_exists($fv_fp,'current_video') && $fv_fp->current_video() ) {
90	+ $ttl = intval( $fv_fp->current_video()->getMetaValue('duration',true ) );
91	+ } else if( !empty($post) && !empty($post->ID) ) {
92	+ if( $sDuration = flowplayer::get_duration( $post->ID, $url, true ) ) {
93	+ $ttl = intval($sDuration);
94	+ }
95	+ }
96	+
97	+ $url = $this->secure_link($url,$this->aSecureTokens[$i],$ttl);
98	+ }
99	+ }
100	+ }
101	+ }
102	+
103	+ return $url;
104	+ }
105	+
106	+
107	+ function get_signed_url_long( $url ) {
108	+ return $this->get_signed_url($url, array( 'dynamic' => true ), 172800);
109	+ }
110	+
111	+
112	+ function get_domains() {
113	+ global $fv_fp;
114	+ if( isset($fv_fp->conf[$this->key]) && isset($fv_fp->conf[$this->key]['domain']) ) {
115	+ return array( $fv_fp->conf[$this->key]['domain'] );
116	+ }
117	+ return false;
118	+ }
119	+
120	+
121	+ function get_secure_tokens() {
122	+ global $fv_fp;
123	+ if( isset($fv_fp->conf[$this->key]) && isset($fv_fp->conf[$this->key]['secure_token']) ) {
124	+ return array( $fv_fp->conf[$this->key]['secure_token'] );
125	+ }
126	+ return false;
127	+ }
128	+
129	+
130	+ function load_options() {
131	+ global $fv_fp;
132	+ if( empty($fv_fp) ) return;
133	+
134	+ if( !$this->aDomains ) {
135	+ $this->aDomains = $this->get_domains();
136	+ }
137	+ if( !$this->aSecureTokens ) {
138	+ $this->aSecureTokens = $this->get_secure_tokens();
139	+ }
140	+
141	+ if( $this->aDomains && $this->aSecureTokens ) {
142	+ add_filter( 'fv_player_pro_video_ajaxify_domains', array( $this, 'domains'), 999, 2 );
143	+ add_filter( 'fv_player_pro_video_ajaxify_args', array( $this, 'args'), 999, 2 );
144	+
145	+ add_action( 'plugins_loaded', array( $this, 'ajax' ), 9 );
146	+
147	+ add_filter( 'fv_flowplayer_video_src', array( $this, 'get_signed_url'), 10, 2 );
148	+
149	+ add_filter( 'fv_flowplayer_splash', array( $this, 'get_signed_url_long') );
150	+ add_filter( 'fv_flowplayer_playlist_splash', array( $this, 'get_signed_url_long') );
151	+ add_filter( 'fv_flowplayer_resource', array( $this, 'get_signed_url_long') );
152	+ }
153	+ }
154	+
155	+
156	+ function options() {
157	+ global $fv_fp;
158	+ ?>
159	+ <table class="form-table2" style="margin: 5px; ">
160	+ <tr>
161	+ <td style="vertical-align:top"><label for="<?php echo $this->key; ?>[domain]"><?php _e('Domain', 'fv-wordpress-flowplayer'); ?>:</label></td>
162	+ <td>
163	+ <input type="text" size="40" name="<?php echo $this->key; ?>[domain]" id="<?php echo $this->key; ?>[keycdn_domain]" value="<?php if( isset($fv_fp->conf[$this->key][$this->key.'_domain']) && strlen(trim($fv_fp->conf[$this->key]['domain'])) ) echo trim($fv_fp->conf[$this->key]['domain']); ?>" />
164	+ <p class="description"><?php _e('You can enter multiple domains separated by <code>,</code>.', 'fv-wordpress-flowplayer'); ?></p>
165	+ </td>
166	+ </tr>
167	+ <tr>
168	+ <td><label for="<?php echo $this->key; ?>[secure_token]"><?php _e('Secure Token', 'fv-wordpress-flowplayer'); ?>:</label></td>
169	+ <td>
170	+ <input type="text" size="40" name="<?php echo $this->key; ?>[secure_token]" id="<?php echo $this->key; ?>[secure_token]" value="<?php if( isset($fv_fp->conf[$this->key][$this->key.'_secure_token']) && strlen(trim($fv_fp->conf[$this->key]['secure_token'])) ) echo trim($fv_fp->conf[$this->key]['secure_token']); ?>" />
171	+ </td>
172	+ </tr>
173	+ <tr>
174	+ <td colspan="4">
175	+ <input type="submit" name="fv-wp-flowplayer-submit" class="button-primary" value="<?php _e('Save All Changes', 'fv-wordpress-flowplayer'); ?>" style="margin-top: 2ex;"/>
176	+ </td>
177	+ </tr>
178	+ </table>
179	+ <?php
180	+ }
181	+
182	+
183	+ function register_meta_boxes() {
184	+ add_meta_box( 'fv_player_'.$this->key, $this->title, array( $this, 'options' ), 'fv_flowplayer_settings_hosting', 'normal', 'low' );
185	+ }
186	+
187	+
188	+ abstract function secure_link( $url, $secret, $ttl = false );
189	+
190	+ }
191	+
192	+ endif;

models/db-video.php CHANGED Viewed

	@@ -66,18 +66,8 @@ class FV_Player_Db_Video {
66	$caption = end($arr);
67	}
68
69	- // ~~update~~ ~~YouTube~~ ~~and~~ ~~other~~ ~~video~~ ~~names~~
70	- $vid_replacements = array(
71	- 'watch?v=' => 'YouTube: ',
72	- 'playlist?list=' => 'YouTube Playlist: ',
73	- );
74
75	- $caption = str_replace(array_keys($vid_replacements), array_values($vid_replacements), $caption);
76	-
77	- if( is_numeric($caption) && intval($caption) == $caption && stripos($src,'vimeo.com/') !== false ) {
78	- $caption = "Vimeo: ".$caption;
79	- }
80	-
81	return urldecode($caption);
82	}
83


66	$caption = end($arr);
67	}
68
69	+ $caption = apply_filters( 'fv_flowplayer_caption_src', $caption , $src );




70






71	return urldecode($caption);
72	}
73

models/digitalocean-spaces-browser.class.php ADDED Viewed

	@@ -0,0 +1,203 @@


1	+ <?php
2	+
3	+ if( !class_exists('FV_Player_DigitalOcean_Spaces_Browser') && class_exists('FV_Player_Media_Browser') ) :
4	+
5	+ class FV_Player_DigitalOcean_Spaces_Browser extends FV_Player_Media_Browser {
6	+
7	+ function init() {
8	+ if( $this->isSetUpCorrectly() ) {
9	+ global $fv_wp_flowplayer_ver;
10	+ wp_enqueue_script( 'fv-player-dos-browser', flowplayer::get_plugin_url().'/js/digitalocean-spaces-browser.js', array( 'flowplayer-browser-base' ), $fv_wp_flowplayer_ver );
11	+ }
12	+ }
13	+
14	+ // Legacy
15	+ function init_for_gutenberg() {}
16	+
17	+ function fv_wp_flowplayer_include_aws_sdk() {
18	+ $free_player_folder = '';
19	+
20	+ foreach (get_option('active_plugins') as $plug) {
21	+ if (strpos($plug, 'flowplayer.php')) {
22	+ $free_player_folder = dirname( WP_PLUGIN_DIR . '/' . $plug );
23	+ }
24	+ }
25	+
26	+ if (!$free_player_folder) {
27	+ throw new Exception('Could not find Free plugin folder to include the AWS SDK!');
28	+ }
29	+
30	+ if ( ! class_exists( 'Aws\S3\S3Client' ) ) {
31	+ require_once( $free_player_folder . "/includes/aws/aws-autoloader.php" );
32	+ }
33	+ }
34	+
35	+ function get_formatted_assets_data() {
36	+ $this->fv_wp_flowplayer_include_aws_sdk();
37	+ global $fv_fp, $s3Client, $FV_Player_DigitalOcean_Spaces;
38	+
39	+ $endpoint = 'https://' . $FV_Player_DigitalOcean_Spaces->get_endpoint();
40	+
41	+ $region = $FV_Player_DigitalOcean_Spaces->get_region();
42	+
43	+ $secret = $fv_fp->_get_option(array('digitalocean_spaces','secret'));
44	+ $key = $fv_fp->_get_option(array('digitalocean_spaces','key'));
45	+ $bucket = $fv_fp->_get_option(array('digitalocean_spaces','space'));
46	+ //$domain = $fv_fp->_get_option(array('digitalocean_spaces','space'));
47	+
48	+ $output = array(
49	+ 'name' => 'Home',
50	+ 'type' => 'folder',
51	+ 'path' => !empty($_POST['path']) ? $_POST['path'] : 'Home/',
52	+ 'items' => array()
53	+ );
54	+
55	+ $credentials = new Aws\Credentials\Credentials( $key, $secret );
56	+
57	+ // instantiate the S3 client with AWS credentials
58	+ $s3Client = Aws\S3\S3Client::factory( array(
59	+ 'credentials' => $credentials,
60	+ 'region' => $region,
61	+ 'version' => 'latest',
62	+ 'endpoint' => $endpoint
63	+ ) );
64	+
65	+ try {
66	+ $args = array(
67	+ 'Bucket' => $bucket,
68	+ 'Delimiter' => '/',
69	+ );
70	+
71	+ $request_path = !empty($_POST['path']) ? str_replace( 'Home/', '', stripslashes($_POST['path']) ) : false;
72	+
73	+ if( $request_path ) {
74	+ $args['Prefix'] = $request_path;
75	+ }
76	+
77	+ $paged = $s3Client->getPaginator('ListObjects',$args);
78	+
79	+ $date_format = get_option( 'date_format' );
80	+ foreach( $paged AS $res ) {
81	+
82	+ $folders = !empty($res['CommonPrefixes']) ? $res['CommonPrefixes'] : array();
83	+ $files = $res->get('Contents');
84	+ if( !$files ) $files = array();
85	+
86	+ $objects = array_merge( $folders, $files );
87	+
88	+ foreach ( $objects as $object ) {
89	+ if ( ! isset( $objectarray ) ) {
90	+ $objectarray = array();
91	+ }
92	+
93	+ $item = array();
94	+
95	+ $path = $object['Prefix'] ? $object['Prefix'] : $object['Key'];
96	+
97	+ $item['path'] = 'Home/' . $path;
98	+
99	+ if( $request_path ) {
100	+ if( $request_path == $path ) continue; // sometimes the current folder is present in the response, weird
101	+
102	+ $item['name'] = str_replace( $request_path, '', $path );
103	+ } else {
104	+ $item['name'] = $path;
105	+ }
106	+
107	+ if( !empty($object['Size']) ) {
108	+ $item['type'] = 'file';
109	+ $item['size'] = $object['Size'];
110	+ $item['LastModified'] = $object['LastModified'];
111	+ $item['modified'] = date($date_format, strtotime($object['LastModified']));
112	+
113	+ $link = (string) $s3Client->getObjectUrl( $bucket, $path );
114	+ $url_components = parse_url($link);
115	+ $link = str_replace( $url_components['path'], urldecode($url_components['path']), $link );
116	+
117	+ // TODO: check and implement custom domain URLs
118	+ /*// replace link with Custom Domain URL, if we have one
119	+ if( !empty($domains[$array_id]) ) {
120	+ // replace S3 URLs with buckets in the S3 subdomain
121	+ $link = preg_replace('/https?:\/\/' . $bucket . '\.s3[^.]\.amazonaws\.com\/(.)/i', rtrim($domains[$array_id], '/').'/$1', $link);
122	+
123	+ // replace S3 URLs with bucket name as a subfolder
124	+ $link = preg_replace('/https?:\/\/[^\/]+\/' . $bucket . '\/(.*)/i', rtrim($domains[$array_id], '/').'/$1', $link);
125	+ }*/
126	+
127	+ $item['link'] = $link;
128	+
129	+ if (preg_match('/\.(jpg\|jpeg\|png\|gif)$/i', $item['name'])) {
130	+ $item['splash'] = apply_filters('fv_flowplayer_splash', $link );
131	+ }
132	+ } else {
133	+ $item['type'] = 'folder';
134	+ $item['items'] = array();
135	+ }
136	+
137	+ $output['items'][] = $item;
138	+
139	+ if (strtolower(substr($item['name'], strrpos($item['name'], '.') + 1)) === 'ts') {
140	+ continue;
141	+ }
142	+
143	+ }
144	+ }
145	+
146	+ } catch ( Aws\S3\Exception\S3Exception $e ) {
147	+ //echo $e->getMessage() . "\n";
148	+ $err = $e->getMessage();
149	+ $output = array(
150	+ 'items' => array(),
151	+ 'name' => '/',
152	+ 'path' => '/',
153	+ 'type' => 'folder'
154	+ );
155	+ }
156	+
157	+ // sorting by date, descending
158	+ // TODO: Make this an interface option? How to handle it for paged listings, like on Vimeo?
159	+ function date_compare($a, $b) {
160	+ $t1 = strtotime($a['LastModified']);
161	+ $t2 = strtotime($b['LastModified']);
162	+ return $t1 - $t2;
163	+ }
164	+ usort($output['items'], 'date_compare');
165	+
166	+ $output['items'] = array_reverse($output['items']);
167	+
168	+ $json_final = array(
169	+ 'items' => $output
170	+ );
171	+
172	+ if (isset($err) && $err) {
173	+ $json_final['err'] = $err;
174	+ }
175	+
176	+ return $json_final;
177	+ }
178	+
179	+ function load_assets() {
180	+ $json_final = $this->get_formatted_assets_data();
181	+
182	+ wp_send_json( $json_final );
183	+ wp_die();
184	+ }
185	+
186	+ // checks whether options for DOS are set
187	+ // ... used to determine whether to actually include the DOS JS or not
188	+ public function isSetUpCorrectly() {
189	+ global $fv_fp;
190	+
191	+ return (
192	+ $fv_fp->_get_option(array('digitalocean_spaces','endpoint'))
193	+ && $fv_fp->_get_option(array('digitalocean_spaces','secret'))
194	+ && $fv_fp->_get_option(array('digitalocean_spaces','key'))
195	+ && $fv_fp->_get_option(array('digitalocean_spaces','space'))
196	+ );
197	+ }
198	+
199	+ }
200	+
201	+ new FV_Player_DigitalOcean_Spaces_Browser( 'wp_ajax_load_dos_assets' );
202	+
203	+ endif;

models/digitalocean-spaces.class.php ADDED Viewed

	@@ -0,0 +1,192 @@


1	+ <?php
2	+
3	+ if( !class_exists('FV_Player_DigitalOcean_Spaces') ) :
4	+
5	+ class FV_Player_DigitalOcean_Spaces extends FV_Player_CDN {
6	+
7	+ function __construct() {
8	+ // TODO: What if FV Player is not yet loaded?
9	+ parent::__construct( array( 'key' => 'digitalocean_spaces', 'title' => 'DigitalOcean Spaces') );
10	+
11	+ // we use priority of 9 to make sure it's loaded before FV Player Pro would load it
12	+ add_action( 'plugins_loaded', array( $this, 'include_dos_media_browser' ), 9 );
13	+ add_action( 'admin_init', array( $this, 'remove_fv_player_pro_dos' ), 21 );
14	+ add_action( 'admin_init', array( $this, 'migrate_fv_player_pro_dos' ), 21 );
15	+ }
16	+
17	+ // includes the Digital Ocean Spaces handling class itself
18	+ public function include_dos_media_browser() {
19	+ if ( is_admin() && version_compare(phpversion(),'5.5.0') != -1 ) {
20	+ include( dirname( __FILE__ ) . '/digitalocean-spaces-browser.class.php' );
21	+ }
22	+ }
23	+
24	+ function get_endpoint() {
25	+ global $fv_fp;
26	+ $parsed = parse_url( $fv_fp->_get_option( array($this->key,'endpoint' ) ) );
27	+
28	+ if( count($parsed) == 1 && !empty($parsed['path']) ) { // for input like "region.digitaloceanspaces.com" it returns it as path, not realizing it's the hostname
29	+ return $parsed['path'];
30	+
31	+ } else if( !empty($parsed['host']) ) {
32	+ return $parsed['host'];
33	+
34	+ }
35	+ return false;
36	+ }
37	+
38	+ function get_domains() {
39	+ global $fv_fp;
40	+ $space = $fv_fp->_get_option( array($this->key,'space' ) );
41	+ $endpoint = $this->get_endpoint();
42	+ if( $space && $endpoint ) {
43	+ return array( $space.'.'.$endpoint, $endpoint.'/'.$space );
44	+ }
45	+ return false;
46	+ }
47	+
48	+ function get_region() {
49	+ $parts = explode( '.', $this->get_endpoint() );
50	+ return $parts[0];
51	+ }
52	+
53	+ function get_secure_tokens() {
54	+ global $fv_fp;
55	+ return $fv_fp->_get_option( array($this->key,'key' ) ) && $fv_fp->_get_option( array($this->key,'secret' ) );
56	+ }
57	+
58	+ /*
59	+ * Migrate DigitalOcean Spaces settings from FV Player Pro
60	+ */
61	+ function migrate_fv_player_pro_dos() {
62	+ $option = get_option('fvwpflowplayer');
63	+
64	+ $found_anything = false;
65	+
66	+ global $fv_fp;
67	+ foreach( array(
68	+ 'endpoint',
69	+ 'secret',
70	+ 'key',
71	+ 'space'
72	+ ) AS $key ) {
73	+
74	+ // bail if we have something already
75	+ if( !empty($option['digitalocean_spaces']) && !empty($option['digitalocean_spaces'][$key]) ) continue;
76	+
77	+ if( $value = $fv_fp->_get_option( array( 'pro', 'digitalocean_spaces_'.$key ) ) ) {
78	+ if( empty($option['digitalocean_spaces']) ) $option['digitalocean_spaces'] = array();
79	+
80	+ $option['digitalocean_spaces'][$key] = $value;
81	+
82	+ $found_anything = true;
83	+ }
84	+ }
85	+
86	+ if( $found_anything ) {
87	+ update_option('fvwpflowplayer', $option);
88	+ }
89	+
90	+ }
91	+
92	+ function options() {
93	+ // TODO: Fix width
94	+ // TODO: Add custom domain for CDN
95	+ global $fv_fp;
96	+ ?>
97	+ <table class="form-table2" style="margin: 5px; ">
98	+ <?php
99	+ $fv_fp->_get_input_text( array(
100	+ 'key' => array($this->key,'space'),
101	+ 'name' => 'Space Name',
102	+ 'first_td_class' => 'first'
103	+ ) );
104	+ $fv_fp->_get_input_text( array(
105	+ 'key' => array($this->key,'endpoint'),
106	+ 'name' => 'Endpoint'
107	+ ) );
108	+ $fv_fp->_get_input_text( array(
109	+ 'key' => array($this->key,'key'),
110	+ 'name' => 'Key'
111	+ ) );
112	+ $fv_fp->_get_input_text( array(
113	+ 'key' => array($this->key,'secret'),
114	+ 'name' => 'Secret'
115	+ ) );
116	+ ?>
117	+ <tr>
118	+ <td colspan="4">
119	+ <input type="submit" name="fv-wp-flowplayer-submit" class="button-primary" value="<?php _e('Save All Changes', 'fv-wordpress-flowplayer'); ?>" style="margin-top: 2ex;"/>
120	+ </td>
121	+ </tr>
122	+ </table>
123	+ <?php
124	+ }
125	+
126	+ function remove_fv_player_pro_dos() {
127	+ // remove the legacy settings box in FV Player Pro
128	+ remove_meta_box('fv_player_pro_digitalocean_spaces', 'fv_flowplayer_settings_hosting', 'normal');
129	+ }
130	+
131	+ function secure_link( $url, $secret, $ttl = false ) {
132	+ global $fv_fp;
133	+ $key = $fv_fp->_get_option( array($this->key,'key' ) );
134	+ $secret = $fv_fp->_get_option( array($this->key,'secret' ) );
135	+ $endpoint = $fv_fp->_get_option( array($this->key,'endpoint' ) );
136	+ $endpoint = explode('.',$endpoint);
137	+ $endpoint = $endpoint[0];
138	+
139	+ /$path = preg_replace( '~.?//.*?/~', '/', $url );
140	+ $expires = time() + ( $ttl ? $ttl : apply_filters('fv_player_secure_link_timeout', 900) );
141	+ $md5 = base64_encode(md5($path . $secret . $expires, true));
142	+ $md5 = strtr($md5, '+/', '-_');
143	+ $md5 = str_replace('=', '', $md5);
144	+ $url = str_replace( $path, $path."?token=".$md5."&expire=".$expires, $url );*/
145	+
146	+ $time = $ttl ? $ttl : apply_filters('fv_player_secure_link_timeout', 900);
147	+
148	+ $url_components = parse_url($url);
149	+
150	+ $sXAMZDate = gmdate('Ymd\THis\Z');
151	+ $sDate = gmdate('Ymd');
152	+ $sCredentialScope = $sDate."/".$endpoint."/s3/aws4_request"; // todo: variable
153	+ $sSignedHeaders = "host";
154	+ $sXAMZCredential = urlencode( $key.'/'.$sCredentialScope);
155	+
156	+ // 1. http://docs.aws.amazon.com/general/latest/gr/sigv4-create-canonical-request.html
157	+ $sCanonicalRequest = "GET\n";
158	+ $sCanonicalRequest .= $url_components['path']."\n";
159	+ $sCanonicalRequest .= "X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=$sXAMZCredential&X-Amz-Date=$sXAMZDate&X-Amz-Expires=$time&X-Amz-SignedHeaders=$sSignedHeaders\n";
160	+ $sCanonicalRequest .= "host:".$url_components['host']."\n";
161	+ $sCanonicalRequest .= "\n$sSignedHeaders\n";
162	+ $sCanonicalRequest .= "UNSIGNED-PAYLOAD";
163	+
164	+ // 2. http://docs.aws.amazon.com/general/latest/gr/sigv4-create-string-to-sign.html
165	+ $sStringToSign = "AWS4-HMAC-SHA256\n";
166	+ $sStringToSign .= "$sXAMZDate\n";
167	+ $sStringToSign .= "$sCredentialScope\n";
168	+ $sStringToSign .= hash('sha256',$sCanonicalRequest);
169	+
170	+ // 3. http://docs.aws.amazon.com/general/latest/gr/sigv4-calculate-signature.html
171	+ $sSignature = hash_hmac('sha256', $sDate, "AWS4".$secret, true );
172	+ $sSignature = hash_hmac('sha256', $endpoint, $sSignature, true ); // todo: variable
173	+ $sSignature = hash_hmac('sha256', 's3', $sSignature, true );
174	+ $sSignature = hash_hmac('sha256', 'aws4_request', $sSignature, true );
175	+ $sSignature = hash_hmac('sha256', $sStringToSign, $sSignature );
176	+
177	+ // 4. http://docs.aws.amazon.com/general/latest/gr/sigv4-add-signature-to-request.html
178	+ $url .= "?X-Amz-Algorithm=AWS4-HMAC-SHA256";
179	+ $url .= "&X-Amz-Credential=$sXAMZCredential";
180	+ $url .= "&X-Amz-Date=$sXAMZDate";
181	+ $url .= "&X-Amz-Expires=$time";
182	+ $url .= "&X-Amz-SignedHeaders=$sSignedHeaders";
183	+ $url .= "&X-Amz-Signature=".$sSignature;
184	+
185	+ return $url;
186	+ }
187	+
188	+ }
189	+ global $FV_Player_DigitalOcean_Spaces;
190	+ $FV_Player_DigitalOcean_Spaces = new FV_Player_DigitalOcean_Spaces;
191	+
192	+ endif;

models/flowplayer-frontend.php CHANGED Viewed

	@@ -28,14 +28,8 @@ class flowplayer_frontend extends flowplayer
28
29	var $expire_time = 0;
30
31	- var $aAds = array();
32	-
33	var $aPlayers = array();
34
35	- var $aPlaylists = array();
36	-
37	- var $aPopups = array();
38	-
39	var $aCurArgs = array();
40
41	var $sHTMLAfter = false;
	@@ -559,10 +553,6 @@ class flowplayer_frontend extends flowplayer
559	}
560	$this->sHTMLAfter .= $playlist_items_external_html;
561
562	- if( $this->_get_option('old_code') ) {
563	- $this->aPlaylists["wpfp_{$this->hash}"] = $aPlaylistItems;
564	- }
565	-
566	} else if( !empty($this->aCurArgs['caption']) && empty($this->aCurArgs['lightbox']) ) {
567	$attributes['class'] .= ' has-caption';
568	$this->sHTMLAfter = apply_filters( 'fv_player_caption', "<p class='fp-caption'>".$this->aCurArgs['caption']."</p>", $this );
	@@ -586,13 +576,6 @@ class flowplayer_frontend extends flowplayer
586	$attributes['data-fv_redirect'] = trim($this->aCurArgs['redirect']);
587	}
588
589	- if( !empty($this->aCurArgs['end_actions']) && $this->aCurArgs['end_actions'] == 'loop' ) {
590	- $attributes['data-fv_loop'] = true;
591	- } else if (isset($this->aCurArgs['loop']) && $this->aCurArgs['loop'] == 'true') {
592	- // compatibility fallback for classic (non-DB) shortcode
593	- $attributes['data-fv_loop'] = true;
594	- }
595	-
596	if( isset($this->aCurArgs['admin_warning']) ) {
597	$this->sHTMLAfter .= wpautop($this->aCurArgs['admin_warning']);
598	}
	@@ -613,6 +596,24 @@ class flowplayer_frontend extends flowplayer
613	}
614	}
615	}


















616
617	add_filter( 'fv_flowplayer_attributes', array( $this, 'get_speed_attribute' ) );
618
	@@ -642,13 +643,6 @@ class flowplayer_frontend extends flowplayer
642	if( isset($splashend_contents) ) {
643	$this->ret['html'] .= $splashend_contents;
644	}
645	- if( $popup_contents = $this->get_popup_code() ) {
646	- $this->aPopups["wpfp_{$this->hash}"] = $popup_contents;
647	- }
648	-
649	- if( $ad_contents = $this->get_ad_code() ) {
650	- $this->aAds["wpfp_{$this->hash}"] = $ad_contents;
651	- }
652
653	if( flowplayer::is_special_editor() ) {
654	$this->ret['html'] .= '<div class="fp-ui"></div>';
	@@ -1224,7 +1218,7 @@ HTML;
1224	$tags['div']['data-engine'] = true;
1225	$tags['div']['data-embed'] = true;
1226	$tags['div']['data-fv-embed'] = true;
1227	- $tags['div']['data-~~fv_loop~~'] = true;
1228	$tags['div']['data-fv_redirect'] = true;
1229	$tags['div']['data-fvautoplay'] = true;
1230	$tags['div']['data-fvsticky'] = true;


28
29	var $expire_time = 0;
30


31	var $aPlayers = array();
32




33	var $aCurArgs = array();
34
35	var $sHTMLAfter = false;

553	}
554	$this->sHTMLAfter .= $playlist_items_external_html;
555




556	} else if( !empty($this->aCurArgs['caption']) && empty($this->aCurArgs['lightbox']) ) {
557	$attributes['class'] .= ' has-caption';
558	$this->sHTMLAfter = apply_filters( 'fv_player_caption', "<p class='fp-caption'>".$this->aCurArgs['caption']."</p>", $this );

576	$attributes['data-fv_redirect'] = trim($this->aCurArgs['redirect']);
577	}
578







579	if( isset($this->aCurArgs['admin_warning']) ) {
580	$this->sHTMLAfter .= wpautop($this->aCurArgs['admin_warning']);
581	}

596	}
597	}
598	}
599	+
600	+ if(
601	+ !empty($this->aCurArgs['end_actions']) && $this->aCurArgs['end_actions'] == 'loop' \|\|
602	+ // compatibility fallback for classic (non-DB) shortcode
603	+ isset($this->aCurArgs['loop']) && $this->aCurArgs['loop'] == 'true'
604	+ ) {
605	+ $attributes['data-loop'] = true;
606	+ unset($attributes['data-advance']); // loop won't work if auto advance is disabled
607	+ }
608	+
609	+
610	+ if( $popup_contents = $this->get_popup_code() ) {
611	+ $attributes['data-popup'] = $this->json_encode( $popup_contents );
612	+ }
613	+
614	+ if( $ad_contents = $this->get_ad_code() ) {
615	+ $attributes['data-ad'] = $this->json_encode( $ad_contents );
616	+ }
617
618	add_filter( 'fv_flowplayer_attributes', array( $this, 'get_speed_attribute' ) );
619

643	if( isset($splashend_contents) ) {
644	$this->ret['html'] .= $splashend_contents;
645	}







646
647	if( flowplayer::is_special_editor() ) {
648	$this->ret['html'] .= '<div class="fp-ui"></div>';

1218	$tags['div']['data-engine'] = true;
1219	$tags['div']['data-embed'] = true;
1220	$tags['div']['data-fv-embed'] = true;
1221	+ $tags['div']['data-loop'] = true;
1222	$tags['div']['data-fv_redirect'] = true;
1223	$tags['div']['data-fvautoplay'] = true;
1224	$tags['div']['data-fvsticky'] = true;

models/flowplayer.php CHANGED Viewed

	@@ -370,7 +370,7 @@ class flowplayer extends FV_Wordpress_Flowplayer_Plugin_Private {
370	$val = is_numeric($default) \|\| !empty($saved_value) ? $saved_value : $default;
371	?>
372	<tr>
373	- <td<?php echo $first_td_class; ?>><label for="<?php echo $key; ?>"><?php echo $name; ~~?> <?~~php if( $help ) echo '<a href="#" class="show-info"><span class="dashicons dashicons-info"></span></a>'; ?>:</label></td>
374	<td>
375	<input <?php echo $class_name; ?> id="<?php echo esc_attr($key); ?>" name="<?php echo esc_attr($key); ?>" <?php if ($title) { echo $title; } ?>type="text" value="<?php echo esc_attr($val); ?>"<?php
376	if (isset($options['data']) && is_array($options['data'])) {
	@@ -735,7 +735,7 @@ class flowplayer extends FV_Wordpress_Flowplayer_Plugin_Private {
735
736	fv_wp_flowplayer_delete_extensions_transients();
737
738	- if( $aOldOptions['key'] != $sKey ) {
739	global $FV_Player_Pro_loader;
740	if( isset($FV_Player_Pro_loader) ) {
741	$FV_Player_Pro_loader->license_key = $sKey;


370	$val = is_numeric($default) \|\| !empty($saved_value) ? $saved_value : $default;
371	?>
372	<tr>
373	+ <td<?php echo $first_td_class; ?>><label for="<?php echo $key; ?>"><?php echo $name; ?><?php if( $help ) echo ' <a href="#" class="show-info"><span class="dashicons dashicons-info"></span></a>'; ?>:</label></td>
374	<td>
375	<input <?php echo $class_name; ?> id="<?php echo esc_attr($key); ?>" name="<?php echo esc_attr($key); ?>" <?php if ($title) { echo $title; } ?>type="text" value="<?php echo esc_attr($val); ?>"<?php
376	if (isset($options['data']) && is_array($options['data'])) {

735
736	fv_wp_flowplayer_delete_extensions_transients();
737
738	+ if( empty($aOldOptions['key']) \|\| $aOldOptions['key'] != $sKey ) {
739	global $FV_Player_Pro_loader;
740	if( isset($FV_Player_Pro_loader) ) {
741	$FV_Player_Pro_loader->license_key = $sKey;

models/media-browser-s3.php CHANGED Viewed

	@@ -9,10 +9,6 @@ class FV_Player_Media_Browser_S3 extends FV_Player_Media_Browser {
9	}
10	}
11
12	- function init_for_gutenberg() {
13	- add_action( 'admin_footer', array($this, 'init'), 1 );
14	- }
15	-
16	function fv_wp_flowplayer_include_aws_sdk() {
17	if ( ! class_exists( 'Aws\S3\S3Client' ) ) {
18	require_once( dirname( __FILE__ ) . "/../includes/aws/aws-autoloader.php" );


9	}
10	}
11




12	function fv_wp_flowplayer_include_aws_sdk() {
13	if ( ! class_exists( 'Aws\S3\S3Client' ) ) {
14	require_once( dirname( __FILE__ ) . "/../includes/aws/aws-autoloader.php" );

models/media-browser.php CHANGED Viewed

	@@ -5,10 +5,13 @@ abstract class FV_Player_Media_Browser {
5	public $ajax_action_name = 'wp_ajax_load_assets';
6
7	public function __construct($ajax_action_name) {

8	// load base JS
9	- add_action( 'edit_form_after_editor', array($this, 'init_base'), 1 );
10	- add_action( 'enqueue_block_editor_assets', array($this, '~~init_for_gutenberg_base~~') );
11	- add_action( '~~admin_footer~~', array($this, 'init_base'), 1 );


12
13	// register extending class WP AJAX action
14	$this->ajax_action_name = $ajax_action_name;
	@@ -16,12 +19,12 @@ abstract class FV_Player_Media_Browser {
16	}
17
18	abstract function init();
19	- abstract function init_for_gutenberg();
20
21	function init_base() {
22	global $fv_wp_flowplayer_ver;

23	wp_enqueue_script( 'flowplayer-browser-base', flowplayer::get_plugin_url().'/js/media-library-browser-base.js', array('jquery'), $fv_wp_flowplayer_ver, true );
24	- wp_enqueue_style('fvwpflowplayer-s3-browser', flowplayer::get_plugin_url().'/css/s3-browser.css',''~~,'1.0','screen'~~);
25	$this->init();
26	}
27


5	public $ajax_action_name = 'wp_ajax_load_assets';
6
7	public function __construct($ajax_action_name) {
8	+
9	// load base JS
10	+ add_action( 'edit_form_after_editor', array($this, 'init_base'), 1 ); // for old WP editor
11	+ add_action( 'enqueue_block_editor_assets', array($this, 'init_base') ); // for Gutenberg
12	+ add_action( 'admin_print_scripts-toplevel_page_fv_player', array($this, 'init_base'), 0 ); // wp-admin -> FV Player
13	+ add_action( 'admin_print_scripts-widgets.php', array($this, 'init_base'), 0 ); // wp-admin -> Widgets
14	+ add_action( 'admin_print_scripts-fv-player_page_fv_player_coconut', array($this, 'init_base'), 0 ); // wp-admin -> FV Player -> Encode video
15
16	// register extending class WP AJAX action
17	$this->ajax_action_name = $ajax_action_name;

19	}
20
21	abstract function init();

22
23	function init_base() {
24	global $fv_wp_flowplayer_ver;
25	+ wp_enqueue_media();
26	wp_enqueue_script( 'flowplayer-browser-base', flowplayer::get_plugin_url().'/js/media-library-browser-base.js', array('jquery'), $fv_wp_flowplayer_ver, true );
27	+ wp_enqueue_style('fvwpflowplayer-s3-browser', flowplayer::get_plugin_url().'/css/s3-browser.css','',$fv_wp_flowplayer_ver);
28	$this->init();
29	}
30

models/player-position-save.php CHANGED Viewed

@@ -3,31 +3,52 @@ class FV_Player_Position_Save {
               public function __construct() {
                 add_action( 'wp_ajax_fv_wp_flowplayer_video_position_save', array($this, 'video_position_save') );
-            -
                add_filter('fv_player_item', array($this, 'set_last_position') );
                 add_filter('fv_flowplayer_admin_default_options_after', array( $this, 'player_position_save_admin_default_options_html' ) );
                 add_filter( 'fv_flowplayer_attributes', array( $this, 'shortcode' ), 10, 3 );
+              }
-            -
              private function get_extensionless_file_name($path) {
                 return pathinfo($path, PATHINFO_FILENAME);
+              }
-            -
              public function set_last_position($aItemArray) {
                 global $fv_fp;
                 // we only use the first source to check for stored position,
                 // since other sources would be alternatives (in quality, etc.)
                 if (
                   ( !empty($fv_fp->aCurArgs['saveposition']) || $fv_fp->_get_option('video_position_save_enable') ) &&
                   is_user_logged_in() &&
-            -
                  is_array($aItemArray) &&
-            -
                  isset($aItemArray['sources']) &&
-            -
                  isset($aItemArray['sources'][0]) &&
-            -
                  ($metaPosition = get_user_meta( get_current_user_id(), 'fv_wp_flowplayer_position_' . $this->get_extensionless_file_name($aItemArray['sources'][0]['src']), true ))
                 ) {
-            -
                  $aItemArray['sources'][0]['position'] = $metaPosition;
+                }
-            -
                return $aItemArray;
+              }
               public function video_position_save() {
@@ -42,8 +63,24 @@ class FV_Player_Position_Save {
                 if (is_user_logged_in() && isset($_POST['videoTimes']) && ($times = $_POST['videoTimes']) && count($times)) {
                   $uid = get_current_user_id();
                   foreach ($times as $record) {
-            -
                    update_user_meta($uid, 'fv_wp_flowplayer_position_'.$this->get_extensionless_file_name($record['name']), $record['position']);
+                  }
                   wp_send_json_success();
                 } else {
                   wp_send_json_error();


3
4	public function __construct() {
5	add_action( 'wp_ajax_fv_wp_flowplayer_video_position_save', array($this, 'video_position_save') );
6	+ add_filter('fv_player_item', array($this, 'set_last_position'), 10, 3 );
7	add_filter('fv_flowplayer_admin_default_options_after', array( $this, 'player_position_save_admin_default_options_html' ) );
8
9	add_filter( 'fv_flowplayer_attributes', array( $this, 'shortcode' ), 10, 3 );
10	}
11
12	+ public static function get_extensionless_file_name($path) {
13	return pathinfo($path, PATHINFO_FILENAME);
14	}
15
16	+ public function set_last_position( $aItem, $index, $aArgs ) {
17	global $fv_fp;
18	// we only use the first source to check for stored position,
19	// since other sources would be alternatives (in quality, etc.)
20	if (
21	( !empty($fv_fp->aCurArgs['saveposition']) \|\| $fv_fp->_get_option('video_position_save_enable') ) &&
22	is_user_logged_in() &&
23	+ is_array($aItem) &&
24	+ isset($aItem['sources']) &&
25	+ isset($aItem['sources'][0])

26	) {
27	+
28	+ $try = array();
29	+ if( $fv_fp->current_player() ) {
30	+ $aVideos = $fv_fp->current_player()->getVideos();
31	+ if( $aVideos && !empty($aVideos[$index]) ) {
32	+ $try[] = $aVideos[$index]->getId();
33	+ }
34	+ }
35	+ $try[] = $this->get_extensionless_file_name($aItem['sources'][0]['src']);
36	+
37	+ foreach( $try AS $name ) {
38	+ if( $metaPosition = get_user_meta( get_current_user_id(), 'fv_wp_flowplayer_position_' . $name, true ) ) {
39	+ $aItem['sources'][0]['position'] = intval($metaPosition);
40	+ break;
41	+ }
42	+ }
43	+
44	+ foreach( $try AS $name ) {
45	+ if( $metaPosition = get_user_meta( get_current_user_id(), 'fv_wp_flowplayer_saw_' . $name, true ) ) {
46	+ $aItem['sources'][0]['saw'] = true;
47	+ break;
48	+ }
49	+ }
50	}
51	+ return $aItem;
52	}
53
54	public function video_position_save() {

63	if (is_user_logged_in() && isset($_POST['videoTimes']) && ($times = $_POST['videoTimes']) && count($times)) {
64	$uid = get_current_user_id();
65	foreach ($times as $record) {
66	+ $name = $this->get_extensionless_file_name($record['name']);
67	+ if( $record['position'] == 0 ) {
68	+ delete_user_meta($uid, 'fv_wp_flowplayer_position_'.$name );
69	+ } else {
70	+ update_user_meta($uid, 'fv_wp_flowplayer_position_'.$name, $record['position']);
71	+ }
72	+
73	+ if( !empty($record['saw']) && $record['saw'] == true ) {
74	+ update_user_meta($uid, 'fv_wp_flowplayer_saw_'.$name, true);
75	+ }
76	+ }
77	+
78	+ if( !empty($_POST['sawVideo']) && is_array($_POST['sawVideo']) ) {
79	+ foreach ($_POST['sawVideo'] as $record) {
80	+ update_user_meta($uid, 'fv_wp_flowplayer_saw_'.$this->get_extensionless_file_name($record['name']), true);
81	+ }
82	}
83	+
84	wp_send_json_success();
85	} else {
86	wp_send_json_error();

models/video-intelligence.php CHANGED Viewed

	@@ -135,9 +135,13 @@ class FV_Player_video_intelligence_Installer {
135	$('#fv-player-vi-remove').click( function() {
136	$.post(ajaxurl, {action:'fv-player-vi-remove'}, function() {
137	$('#fv-player-vi-give-back').prop('checked',false);
138	- $('[href=#postbox-container-tab_video_intelligence]').hide();
139	- $('#~~fv_flowplayer_video_intelligence~~').hide();
140	- $('[href=#postbox-container-tab_video_ads]').~~click(~~);




141	$('#fv_flowplayer_video_intelligence_revival').show();
142	});
143
	@@ -152,7 +156,11 @@ class FV_Player_video_intelligence_Installer {
152	add_meta_box( 'fv_flowplayer_video_intelligence', __('video intelligence', 'fv-wordpress-flowplayer'), array( $this, 'screen_ad' ), 'fv_flowplayer_settings_video_intelligence', 'normal' );
153	add_meta_box( 'fv_flowplayer_video_intelligence_account', __('Account', 'fv-wordpress-flowplayer'), array( $this, 'screen_account' ), 'fv_flowplayer_settings_video_intelligence', 'normal' );
154	add_meta_box( 'fv_flowplayer_video_intelligence_hide', __('Hide vi Ads', 'fv-wordpress-flowplayer'), array( $this, 'settings_hide' ), 'fv_flowplayer_settings_video_intelligence', 'normal' );
155	- ~~add_meta_box~~( ~~'fv_flowplayer_video_intelligence_revival', __~~('~~Free video intelligence ads~~'~~, 'fv-wordpress-flowplayer'~~), ~~array( $this, 'settings_revival'~~ ), ~~'fv_flowplayer_settings_video_ads', 'normal', 'low' );~~




156	}
157	}
158
	@@ -174,10 +182,10 @@ class FV_Player_video_intelligence_Installer {
174	$('#fv-player-vi-give-back').click( function() {
175	$.post(ajaxurl, {action:'fv-player-vi-add'}, function() {
176	$('#fv-player-vi-remove').prop('checked',false);
177	- $('[href=#postbox-container-tab_video_intelligence]').show();
178	$('#fv_flowplayer_video_intelligence').show();
179	$('#fv_flowplayer_video_intelligence_account').show();
180	- $('[href=#postbox-container-tab_video_intelligence]').click();
181	$('#fv_flowplayer_video_intelligence_revival').hide();
182	});
183	});


135	$('#fv-player-vi-remove').click( function() {
136	$.post(ajaxurl, {action:'fv-player-vi-remove'}, function() {
137	$('#fv-player-vi-give-back').prop('checked',false);
138	+ $('[href=\\#postbox-container-tab_video_intelligence]').hide();
139	+ $('#postbox-container-tab_video_intelligence').hide();
140	+ if( $('[href=\\#postbox-container-tab_video_ads]').length ) {
141	+ $('[href=\\#postbox-container-tab_video_ads]').click();
142	+ } else {
143	+ $('[href=\\#postbox-container-tab_actions]').click();
144	+ }
145	$('#fv_flowplayer_video_intelligence_revival').show();
146	});
147

156	add_meta_box( 'fv_flowplayer_video_intelligence', __('video intelligence', 'fv-wordpress-flowplayer'), array( $this, 'screen_ad' ), 'fv_flowplayer_settings_video_intelligence', 'normal' );
157	add_meta_box( 'fv_flowplayer_video_intelligence_account', __('Account', 'fv-wordpress-flowplayer'), array( $this, 'screen_account' ), 'fv_flowplayer_settings_video_intelligence', 'normal' );
158	add_meta_box( 'fv_flowplayer_video_intelligence_hide', __('Hide vi Ads', 'fv-wordpress-flowplayer'), array( $this, 'settings_hide' ), 'fv_flowplayer_settings_video_intelligence', 'normal' );
159	+ if( class_exists('FV_Player_Pro') ) {
160	+ add_meta_box( 'fv_flowplayer_video_intelligence_revival', __('Free video intelligence ads', 'fv-wordpress-flowplayer'), array( $this, 'settings_revival' ), 'fv_flowplayer_settings_video_ads', 'normal', 'low' );
161	+ } else {
162	+ add_meta_box( 'fv_flowplayer_video_intelligence_revival', __('Free video intelligence ads', 'fv-wordpress-flowplayer'), array( $this, 'settings_revival' ), 'fv_flowplayer_settings_actions', 'normal', 'low' );
163	+ }
164	}
165	}
166

182	$('#fv-player-vi-give-back').click( function() {
183	$.post(ajaxurl, {action:'fv-player-vi-add'}, function() {
184	$('#fv-player-vi-remove').prop('checked',false);
185	+ $('[href=\\#postbox-container-tab_video_intelligence]').show();
186	$('#fv_flowplayer_video_intelligence').show();
187	$('#fv_flowplayer_video_intelligence_account').show();
188	+ $('[href=\\#postbox-container-tab_video_intelligence]').click();
189	$('#fv_flowplayer_video_intelligence_revival').hide();
190	});
191	});

readme.txt CHANGED Viewed

	@@ -3,7 +3,7 @@ Contributors: FolioVision
3	Donate link: https://foliovision.com/donate
4	Tags: video player, flowplayer, mobile video, html5 video, Vimeo, html5 player, youtube player, youtube playlist, video playlist, RTMP, Cloudfront, HLS
5	Requires at least: 3.5
6	- Tested up to: 5.4
7	Stable tag: trunk
8	License: GPLv3 or later
9	License URI: http://www.gnu.org/licenses/gpl-3.0.html
	@@ -357,6 +357,24 @@ Thank you for being part of the HMTL 5 mobile video revolution!
357
358	== Changelog ==
359


















360	= 7.4.24.727 - 2020/06/09 =
361
362	* AWS - adding new regions


3	Donate link: https://foliovision.com/donate
4	Tags: video player, flowplayer, mobile video, html5 video, Vimeo, html5 player, youtube player, youtube playlist, video playlist, RTMP, Cloudfront, HLS
5	Requires at least: 3.5
6	+ Tested up to: 5.5
7	Stable tag: trunk
8	License: GPLv3 or later
9	License URI: http://www.gnu.org/licenses/gpl-3.0.html

357
358	== Changelog ==
359
360	+ = 7.4.33.727 - 2020/08/24 =
361	+
362	+ * Bugfix - Autoplay - hide initial play arrow animation when autoplaying a video did also hide the loading progress indicator
363	+ * DASH.js library downgrade to 3.0.0 as some videos wouldn't play on macOS 10.5.6 with Safari 13.1.2
364	+
365	+ = 7.4.32.727 - 2020/08/14 =
366	+
367	+ * Bugfix - Editor - WordPress 5.5 fix for dropdown settings (HTML select tag)
368	+
369	+ = 7.4.31.727 - 2020/08/12 =
370	+
371	+ * Autoplay - hide initial play arrow animation when autoplaying a video
372	+ * DASH.js library update to 3.1.2
373	+ * Keyboard controls - disabled when controlbar hidden
374	+ * Loop fix for FV Player Pro YouTube engine
375	+ * Video Position Saving - remember if logged in user saw the video already
376	+ * WordPress 5.5 fixes
377	+
378	= 7.4.24.727 - 2020/06/09 =
379
380	* AWS - adding new regions

test/integration/backend/testSettingsScreen.html CHANGED Viewed

	@@ -2463,9 +2463,9 @@ jQuery( function($) {
2463	$('#fv-player-vi-remove').click( function() {
2464	$.post(ajaxurl, {action:'fv-player-vi-remove'}, function() {
2465	$('#fv-player-vi-give-back').prop('checked',false);
2466	- $('[href=#postbox-container-tab_video_intelligence]').hide();
2467	$('#fv_flowplayer_video_intelligence').hide();
2468	- $('[href=#postbox-container-tab_video_ads]').click();
2469	$('#fv_flowplayer_video_intelligence_revival').show();
2470	});
2471
	@@ -2641,7 +2641,7 @@ jQuery(document).ready(function(){
2641	}
2642
2643	jQuery('#fv_flowplayer_admin_tabs .nav-tab').removeClass('nav-tab-active');
2644	- jQuery('[href=#'+anchor+']').addClass('nav-tab-active');
2645	jQuery('#dashboard-widgets .postbox-container').hide();
2646	jQuery('#' + anchor).show();
2647	});
	@@ -2650,7 +2650,7 @@ jQuery('#fv_flowplayer_admin_tabs a').on('click',function(e){
2650	window.location.hash = e.target.hash;
2651	var anchor = jQuery(this).attr('href').substring(1);
2652	jQuery('#fv_flowplayer_admin_tabs .nav-tab').removeClass('nav-tab-active');
2653	- jQuery('[href=#'+anchor+']').addClass('nav-tab-active');
2654	jQuery('#dashboard-widgets .postbox-container').hide();
2655	jQuery('#' + anchor).show();
2656	});
	@@ -2684,7 +2684,7 @@ jQuery('a.fv-settings-anchor').on('click',function(e){
2684	var el = jQuery(id);
2685	if(el.length){
2686	var tab = el.parents('.postbox-container').attr('id');
2687	- jQuery('#fv_flowplayer_admin_tabs').find('a[href=#'+tab+']').click()
2688	}
2689	}
2690	});


2463	$('#fv-player-vi-remove').click( function() {
2464	$.post(ajaxurl, {action:'fv-player-vi-remove'}, function() {
2465	$('#fv-player-vi-give-back').prop('checked',false);
2466	+ $('[href=\\#postbox-container-tab_video_intelligence]').hide();
2467	$('#fv_flowplayer_video_intelligence').hide();
2468	+ $('[href=\\#postbox-container-tab_video_ads]').click();
2469	$('#fv_flowplayer_video_intelligence_revival').show();
2470	});
2471

2641	}
2642
2643	jQuery('#fv_flowplayer_admin_tabs .nav-tab').removeClass('nav-tab-active');
2644	+ jQuery('[href=\\#'+anchor+']').addClass('nav-tab-active');
2645	jQuery('#dashboard-widgets .postbox-container').hide();
2646	jQuery('#' + anchor).show();
2647	});

2650	window.location.hash = e.target.hash;
2651	var anchor = jQuery(this).attr('href').substring(1);
2652	jQuery('#fv_flowplayer_admin_tabs .nav-tab').removeClass('nav-tab-active');
2653	+ jQuery('[href=\\#'+anchor+']').addClass('nav-tab-active');
2654	jQuery('#dashboard-widgets .postbox-container').hide();
2655	jQuery('#' + anchor).show();
2656	});

2684	var el = jQuery(id);
2685	if(el.length){
2686	var tab = el.parents('.postbox-container').attr('id');
2687	+ jQuery('#fv_flowplayer_admin_tabs').find('a[href=\\#'+tab+']').click()
2688	}
2689	}
2690	});

test/integration/frontend/endActionsTest.php CHANGED Viewed

	@@ -47,23 +47,13 @@ final class FV_Player_EndActionsTest extends FV_Player_UnitTestCase {
47	$output = apply_filters( 'the_content', '[fvplayer src="https://cdn.site.com/video.mp4" share="no" embed="false" popup="email-1"]' );
48
49	$sample = <<< HTML
50	- <div id="wpfp_2534ca47632437a90737cb5c0e27b461" data-item="{"sources":[{"src":"https:\/\/cdn.site.com\/video.mp4","type":"video\/mp4"}]}" class="flowplayer no-brand is-splash no-svg is-paused skin-slim fp-slim fp-edgy" style="max-width: 640px; max-height: 360px; " data-ratio="0.5625">
51	<div class="fp-ratio" style="padding-top: 56.25%"></div>
52	<div class="fp-ui"><noscript>Please enable JavaScript</noscript><div class="fp-preload"><b></b><b></b><b></b><b></b></div></div>
53	</div>
54	HTML;
55
56	$this->assertEquals( $this->fix_newlines($sample), $this->fix_newlines($output) );
57	-
58	- // is the email popup there?
59	- wp_deregister_script('flowplayer');
60	- flowplayer_prepare_scripts();
61	-
62	- global $wp_scripts;
63	- $this->assertTrue( stripos( $this->fix_newlines($wp_scripts->registered['flowplayer']->extra['data']), $this->fix_newlines('var fv_flowplayer_popup = {"wpfp_282c498132552aaa754164072eaaa0d0":{"html":"<div class=\"fv_player_popup fv_player_popup-1 wpfp_custom_popup_content\"><h3>Subscribe to list one<\/h3><p>Two good reasons to subscribe right now<\/p><form class=\"mailchimp-form mailchimp-form-2\"><input type=\"hidden\" name=\"list\" value=\"1\" \/><input type=\"email\" placeholder=\"Email Address\" name=\"email\"\/><input type=\"text\" placeholder=\"First Name\" name=\"first_name\" required\/><input type=\"submit\" value=\"Subscribe\"\/><\/form><\/div>","pause":false}}') ) !== false );
64	-
65	- global $fv_fp;
66	- $fv_fp->aPopups = array();
67	}
68
69	public function testEndActionsLoop() {
	@@ -71,7 +61,7 @@ HTML;
71	$output = apply_filters( 'the_content', '[fvplayer src="https://cdn.site.com/video.mp4" share="no" embed="false" loop="true"]' );
72
73	$sample = <<< HTML
74	- <div id="wpfp_2534ca47632437a90737cb5c0e27b461" data-item="{"sources":[{"src":"https:\/\/cdn.site.com\/video.mp4","type":"video\/mp4"}]}" class="flowplayer no-brand is-splash no-svg is-paused skin-slim fp-slim fp-edgy" style="max-width: 640px; max-height: 360px; " data-ratio="0.5625" data-~~fv_loop~~="1">
75	<div class="fp-ratio" style="padding-top: 56.25%"></div>
76	<div class="fp-ui"><noscript>Please enable JavaScript</noscript><div class="fp-preload"><b></b><b></b><b></b><b></b></div></div>
77	</div>
	@@ -85,23 +75,13 @@ HTML;
85	$output = apply_filters( 'the_content', '[fvplayer src="https://cdn.site.com/video.mp4" popup="1" share="no" embed="false"]' );
86
87	$sample = <<< HTML
88	- <div id="wpfp_2534ca47632437a90737cb5c0e27b461" data-item="{"sources":[{"src":"https:\/\/cdn.site.com\/video.mp4","type":"video\/mp4"}]}" class="flowplayer no-brand is-splash no-svg is-paused skin-slim fp-slim fp-edgy" style="max-width: 640px; max-height: 360px; " data-ratio="0.5625">
89	<div class="fp-ratio" style="padding-top: 56.25%"></div>
90	<div class="fp-ui"><noscript>Please enable JavaScript</noscript><div class="fp-preload"><b></b><b></b><b></b><b></b></div></div>
91	</div>
92	HTML;
93
94	$this->assertEquals( $this->fix_newlines($sample), $this->fix_newlines($output) );
95	-
96	- // are the popups ready?
97	- wp_deregister_script('flowplayer');
98	- flowplayer_prepare_scripts();
99	-
100	- global $wp_scripts;
101	- $this->assertTrue( stripos( $this->fix_newlines($wp_scripts->registered['flowplayer']->extra['data']), $this->fix_newlines('var fv_flowplayer_popup = {"wpfp_40dd5c9f6426b9d96be06d43e9224af8":{"html":"<div class=\"fv_player_popup fv_player_popup-1 wpfp_custom_popup_content\"><a href=\"https:\/\/foliovision.com\/2018\/07\/panamax\"><img src=\"https:\/\/cdn.foliovision.com\/images\/2018\/07\/PanamaX-5-400x239.jpg\" class=\"alignleft post-image entry-image lazyloaded \" alt=\"PanamaX\" itemprop=\"image\" sizes=\"(max-width: 400px) 100vw, 400px\" srcset=\"https:\/\/cdn.foliovision.com\/images\/2018\/07\/PanamaX-5-400x239.jpg 400w, https:\/\/cdn.foliovision.com\/images\/2018\/07\/PanamaX-5.jpg 1128w\" width=\"400\" height=\"239\"><\/a><\/div>","pause":false}};') ) !== false );
102	-
103	- global $fv_fp;
104	- $fv_fp->aPopups = array();
105	}
106
107	public function testEndActionsPopupHTML() {
	@@ -109,23 +89,13 @@ HTML;
109	$output = apply_filters( 'the_content', '[fvplayer src="https://cdn.site.com/video.mp4" share="no" embed="false" popup="'.addslashes('<a href="https://foliovision.com/2018/07/panamax"><img src="https://cdn.foliovision.com/images/2018/07/PanamaX-5-400x239.jpg" class="alignleft post-image entry-image lazyloaded " alt="PanamaX" itemprop="image" sizes="(max-width: 400px) 100vw, 400px" srcset="https://cdn.foliovision.com/images/2018/07/PanamaX-5-400x239.jpg 400w, https://cdn.foliovision.com/images/2018/07/PanamaX-5.jpg 1128w" width="400" height="239"></a>').'"]' );
110
111	$sample = <<< HTML
112	- <div id="wpfp_2534ca47632437a90737cb5c0e27b461" data-item="{"sources":[{"src":"https:\/\/cdn.site.com\/video.mp4","type":"video\/mp4"}]}" class="flowplayer no-brand is-splash no-svg is-paused skin-slim fp-slim fp-edgy" style="max-width: 640px; max-height: 360px; " data-ratio="0.5625">
113	<div class="fp-ratio" style="padding-top: 56.25%"></div>
114	<div class="fp-ui"><noscript>Please enable JavaScript</noscript><div class="fp-preload"><b></b><b></b><b></b><b></b></div></div>
115	</div>
116	HTML;
117
118	$this->assertEquals( $this->fix_newlines($sample), $this->fix_newlines($output) );
119	-
120	- // are the popups ready?
121	- wp_deregister_script('flowplayer');
122	- flowplayer_prepare_scripts();
123	-
124	- global $wp_scripts;
125	- $this->assertTrue( stripos( $this->fix_newlines($wp_scripts->registered['flowplayer']->extra['data']), $this->fix_newlines('var fv_flowplayer_popup = {"wpfp_40dd5c9f6426b9d96be06d43e9224af8":{"html":"<div class=\"fv_player_popup fv_player_popup-1 wpfp_custom_popup_content\"><a href=\"https:\/\/foliovision.com\/2018\/07\/panamax\"><img src=\"https:\/\/cdn.foliovision.com\/images\/2018\/07\/PanamaX-5-400x239.jpg\" class=\"alignleft post-image entry-image lazyloaded \" alt=\"PanamaX\" itemprop=\"image\" sizes=\"(max-width: 400px) 100vw, 400px\" srcset=\"https:\/\/cdn.foliovision.com\/images\/2018\/07\/PanamaX-5-400x239.jpg 400w, https:\/\/cdn.foliovision.com\/images\/2018\/07\/PanamaX-5.jpg 1128w\" width=\"400\" height=\"239\"><\/a><\/div>","pause":false}};') ) !== false );
126	-
127	- global $fv_fp;
128	- $fv_fp->aPopups = array();
129	}
130
131	public function testEndActionsRedirect() {


47	$output = apply_filters( 'the_content', '[fvplayer src="https://cdn.site.com/video.mp4" share="no" embed="false" popup="email-1"]' );
48
49	$sample = <<< HTML
50	+ <div id="wpfp_2534ca47632437a90737cb5c0e27b461" data-item="{"sources":[{"src":"https:\/\/cdn.site.com\/video.mp4","type":"video\/mp4"}]}" class="flowplayer no-brand is-splash no-svg is-paused skin-slim fp-slim fp-edgy" style="max-width: 640px; max-height: 360px; " data-ratio="0.5625" data-popup="{"html":"<div class=\"fv_player_popup fv_player_popup-1 wpfp_custom_popup_content\"><h3>Subscribe to list one<\/h3><p>Two good reasons to subscribe right now<\/p><form class=\"mailchimp-form mailchimp-form-2\"><input type=\"hidden\" name=\"list\" value=\"1\" \/><input type=\"email\" placeholder=\"Email Address\" name=\"email\"\/><input type=\"text\" placeholder=\"First Name\" name=\"first_name\" required\/><input type=\"submit\" value=\"Subscribe\"\/><\/form><\/div>","pause":false}">
51	<div class="fp-ratio" style="padding-top: 56.25%"></div>
52	<div class="fp-ui"><noscript>Please enable JavaScript</noscript><div class="fp-preload"><b></b><b></b><b></b><b></b></div></div>
53	</div>
54	HTML;
55
56	$this->assertEquals( $this->fix_newlines($sample), $this->fix_newlines($output) );










57	}
58
59	public function testEndActionsLoop() {

61	$output = apply_filters( 'the_content', '[fvplayer src="https://cdn.site.com/video.mp4" share="no" embed="false" loop="true"]' );
62
63	$sample = <<< HTML
64	+ <div id="wpfp_2534ca47632437a90737cb5c0e27b461" data-item="{"sources":[{"src":"https:\/\/cdn.site.com\/video.mp4","type":"video\/mp4"}]}" class="flowplayer no-brand is-splash no-svg is-paused skin-slim fp-slim fp-edgy" style="max-width: 640px; max-height: 360px; " data-ratio="0.5625" data-loop="1">
65	<div class="fp-ratio" style="padding-top: 56.25%"></div>
66	<div class="fp-ui"><noscript>Please enable JavaScript</noscript><div class="fp-preload"><b></b><b></b><b></b><b></b></div></div>
67	</div>

75	$output = apply_filters( 'the_content', '[fvplayer src="https://cdn.site.com/video.mp4" popup="1" share="no" embed="false"]' );
76
77	$sample = <<< HTML
78	+ <div id="wpfp_2534ca47632437a90737cb5c0e27b461" data-item="{"sources":[{"src":"https:\/\/cdn.site.com\/video.mp4","type":"video\/mp4"}]}" class="flowplayer no-brand is-splash no-svg is-paused skin-slim fp-slim fp-edgy" style="max-width: 640px; max-height: 360px; " data-ratio="0.5625" data-popup="{"html":"<div class=\"fv_player_popup fv_player_popup-1 wpfp_custom_popup_content\"><a href=\"https:\/\/foliovision.com\/2018\/07\/panamax\"><img src=\"https:\/\/cdn.foliovision.com\/images\/2018\/07\/PanamaX-5-400x239.jpg\" class=\"alignleft post-image entry-image lazyloaded \" alt=\"PanamaX\" itemprop=\"image\" sizes=\"(max-width: 400px) 100vw, 400px\" srcset=\"https:\/\/cdn.foliovision.com\/images\/2018\/07\/PanamaX-5-400x239.jpg 400w, https:\/\/cdn.foliovision.com\/images\/2018\/07\/PanamaX-5.jpg 1128w\" width=\"400\" height=\"239\"><\/a><\/div>","pause":false}">
79	<div class="fp-ratio" style="padding-top: 56.25%"></div>
80	<div class="fp-ui"><noscript>Please enable JavaScript</noscript><div class="fp-preload"><b></b><b></b><b></b><b></b></div></div>
81	</div>
82	HTML;
83
84	$this->assertEquals( $this->fix_newlines($sample), $this->fix_newlines($output) );










85	}
86
87	public function testEndActionsPopupHTML() {

89	$output = apply_filters( 'the_content', '[fvplayer src="https://cdn.site.com/video.mp4" share="no" embed="false" popup="'.addslashes('<a href="https://foliovision.com/2018/07/panamax"><img src="https://cdn.foliovision.com/images/2018/07/PanamaX-5-400x239.jpg" class="alignleft post-image entry-image lazyloaded " alt="PanamaX" itemprop="image" sizes="(max-width: 400px) 100vw, 400px" srcset="https://cdn.foliovision.com/images/2018/07/PanamaX-5-400x239.jpg 400w, https://cdn.foliovision.com/images/2018/07/PanamaX-5.jpg 1128w" width="400" height="239"></a>').'"]' );
90
91	$sample = <<< HTML
92	+ <div id="wpfp_2534ca47632437a90737cb5c0e27b461" data-item="{"sources":[{"src":"https:\/\/cdn.site.com\/video.mp4","type":"video\/mp4"}]}" class="flowplayer no-brand is-splash no-svg is-paused skin-slim fp-slim fp-edgy" style="max-width: 640px; max-height: 360px; " data-ratio="0.5625" data-popup="{"html":"<div class=\"fv_player_popup fv_player_popup-1 wpfp_custom_popup_content\"><a href=\"https:\/\/foliovision.com\/2018\/07\/panamax\"><img src=\"https:\/\/cdn.foliovision.com\/images\/2018\/07\/PanamaX-5-400x239.jpg\" class=\"alignleft post-image entry-image lazyloaded \" alt=\"PanamaX\" itemprop=\"image\" sizes=\"(max-width: 400px) 100vw, 400px\" srcset=\"https:\/\/cdn.foliovision.com\/images\/2018\/07\/PanamaX-5-400x239.jpg 400w, https:\/\/cdn.foliovision.com\/images\/2018\/07\/PanamaX-5.jpg 1128w\" width=\"400\" height=\"239\"><\/a><\/div>","pause":false}">
93	<div class="fp-ratio" style="padding-top: 56.25%"></div>
94	<div class="fp-ui"><noscript>Please enable JavaScript</noscript><div class="fp-preload"><b></b><b></b><b></b><b></b></div></div>
95	</div>
96	HTML;
97
98	$this->assertEquals( $this->fix_newlines($sample), $this->fix_newlines($output) );










99	}
100
101	public function testEndActionsRedirect() {

test/integration/frontend/testSimpleShortcode.html CHANGED Viewed

@@ -1,8 +1,7 @@
             <title>Test Blog</title>
             <link rel='stylesheet' id='wp-block-library-css'  href='http://example.org/wp-includes/css/dist/block-library/style.css?ver=1.2.3-beta3-45183-src' type='text/css' media='all' />
             <link rel='stylesheet' id='fv_flowplayer-css'  href='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/css/flowplayer.css?ver=1.2.3' type='text/css' media='all' />
-            -
            <link rel='https://api.w.org/' href='http://example.org/index.php?rest_route=/' />
-            -
            <link rel="EditURI" type="application/rsd+xml" title="RSD" href="http://example.org/xmlrpc.php?rsd" />
             <link rel="wlwmanifest" type="application/wlwmanifest+xml" href="http://example.org/wp-includes/wlwmanifest.xml" />
             		<style type="text/css">.recentcomments a{display:inline !important;padding:0 !important;margin:0 !important;}</style>      <style type="text/css">
                 .flowplayer.skin-slim { background-color: #000000 !important; }
@@ -67,51 +66,50 @@
                 <li><a class="sharing-email" href="mailto:?body=Check%20out%20the%20amazing%20video%20here%3A%20http%3A%2F%2Fexample.org%2F%3Fp%3D1234" target="_blank"></a></li></ul><div><a class="sharing-link" href="http://example.org/?p=1234" target="_blank">Link</a></div><div><label><a class="embed-code-toggle" href="#"><strong>Embed</strong></a></label></div><div class="embed-code"><label>Copy and paste this HTML code into your webpage to embed.</label><textarea></textarea></div></div>
             </div>
-            -
            <script type='text/javascript' src='http://example.org/wp-includes/js/jquery/jquery.js?ver=1.12.4'></script>
-            -
            <script type='text/javascript' src='http://example.org/wp-includes/js/jquery/jquery-migrate.js?ver=1.4.1'></script>
-            -
            <script type='text/javascript'>
             /* <![CDATA[ */
             var fv_flowplayer_conf = {"fullscreen":"1","swf":"\/\/example.org\/wp-content\/plugins\/fv-wordpress-flowplayer\/flowplayer\/flowplayer.swf?ver=1.2.3","swfHls":"\/\/example.org\/wp-content\/plugins\/fv-wordpress-flowplayer\/flowplayer\/flowplayerhls.swf?ver=1.2.3","speeds":[0.25,0.5,0.75,1,1.25,1.5,1.75,2],"video_hash_links":"1","safety_resize":"1","volume":"0.7","sticky_video":"","sticky_place":"right-bottom","sticky_width":"380","script_hls_js":"http:\/\/example.org\/wp-content\/plugins\/fv-wordpress-flowplayer\/flowplayer\/hls.min.js?ver=1.2.3","script_dash_js":"http:\/\/example.org\/wp-content\/plugins\/fv-wordpress-flowplayer\/flowplayer\/flowplayer.dashjs.min.js?ver=1.2.3","script_dash_js_version":"2.7","hlsjs":{"startLevel":-1,"fragLoadingMaxRetry":3,"levelLoadingMaxRetry":3,"capLevelToPlayerSize":true}};
-            -
            var fv_flowplayer_translations = {"0":"","1":"Video loading aborted","2":"Network error","3":"Video not properly encoded","4":"Video file not found","5":"Unsupported video","6":"Skin not found","7":"SWF file not found","8":"Subtitles not found","9":"Invalid RTMP URL","10":"Unsupported video format. Try installing Adobe Flash.","11":"Click to watch the video","12":"[This post contains video, click to play]","video_expired":"<h2>Video file expired.<br \/>Please reload the page and play it again.<\/h2>","unsupported_format":"<h2>Unsupported video format.<br \/>Please use a Flash compatible device.<\/h2>","mobile_browser_detected_1":"Mobile browser detected, serving low bandwidth video.","mobile_browser_detected_2":"Click here","mobile_browser_detected_3":"for full quality.","live_stream_failed":"<h2>Live stream load failed.<\/h2><h3>Please try again later, perhaps the stream is currently offline.<\/h3>","live_stream_failed_2":"<h2>Live stream load failed.<\/h2><h3>Please try again later, perhaps the stream is currently offline.<\/h3>","what_is_wrong":"Please tell us what is wrong :","full_sentence":"Please give us more information (a full sentence) so we can help you better","error_JSON":"Admin: Error parsing JSON","no_support_IE9":"Admin: Video checker doesn't support IE 9.","check_failed":"Admin: Check failed.","playlist_current":"Now Playing","playlist_item_no":"Item %d.","playlist_play_all":"Play All","playlist_play_all_button":"All","playlist_replay_all":"Replay Playlist","playlist_replay_video":"Repeat Track","playlist_shuffle":"Shuffle Playlist","video_issues":"Video Issues","video_reload":"Video loading has stalled, click to reload","link_copied":"Video Link Copied to Clipboard","embed_copied":"Embed Code Copied to Clipboard","subtitles_disabled":"Subtitles disabled","subtitles_switched":"Subtitles switched to ","warning_iphone_subs":"This video has subtitles, that are not supported on your device.","warning_unstable_android":"You are using an old Android device. If you experience issues with the video please use <a href=\"https:\/\/play.google.com\/store\/apps\/details?id=org.mozilla.firefox\">Firefox<\/a>. <a target=\"_blank\" href=\"https:\/\/foliovision.com\/2017\/05\/issues-with-vimeo-on-android\">Why?<\/a>","warning_samsungbrowser":"You are using the Samsung Browser which is an older and buggy version of Google Chrome. If you experience issues with the video please use <a href=\"https:\/\/www.mozilla.org\/en-US\/firefox\/new\/\">Firefox<\/a> or other modern browser. <a target=\"_blank\" href=\"https:\/\/foliovision.com\/2017\/05\/issues-with-vimeo-on-android\">Why?<\/a>","warning_old_safari":"You are using an old Safari browser. If you experience issues with the video please use <a href=\"https:\/\/www.mozilla.org\/en-US\/firefox\/new\/\">Firefox<\/a> or other modern browser.","warning_old_chrome":"You are using an old Chrome browser. Please make sure you use the latest version.","warning_old_firefox":"You are using an old Firefox browser. Please make sure you use the latest version.","warning_old_ie":"You are using a deprecated browser. If you experience issues with the video please use <a href=\"https:\/\/www.mozilla.org\/en-US\/firefox\/new\/\">Firefox<\/a> or other modern browser."};
             var fv_fp_ajaxurl = "http:\/\/example.org\/wp-admin\/admin-ajax.php";
             var fv_flowplayer_playlists = [];
             /* ]]> */
             </script>
-            -
            <script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/flowplayer.min.js?ver=1.2.3'></script>
-            -
            <script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/fv-player.js?ver=1.2.3'></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'></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'></script>
-            -
            <script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/analytics.module.js?ver=1.2.3'></script>
-            -
            <script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/appearance.module.js?ver=1.2.3'></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'></script>
-            -
            <script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/compatibility.module.js?ver=1.2.3'></script>
-            -
            <script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/elementor.module.js?ver=1.2.3'></script>
-            -
            <script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/embed.module.js?ver=1.2.3'></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'></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'></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'></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'></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'></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'></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'></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'></script>
-            -
            <script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/mailchimp.module.js?ver=1.2.3'></script>
-            -
            <script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/mobile.module.js?ver=1.2.3'></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'></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'></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'></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'></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'></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'></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'></script>
-            -
            <script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/s3.module.js?ver=1.2.3'></script>
-            -
            <script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/sharing.module.js?ver=1.2.3'></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'></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'></script>
-            -
            <script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/stats.module.js?ver=1.2.3'></script>
-            -
            <script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/sticky.module.js?ver=1.2.3'></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'></script>
-            -
            <script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/subtitle.module.js?ver=1.2.3'></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'></script>
-            -
            <script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/volume.module.js?ver=1.2.3'></script>
-            -
            <script type='text/javascript' src='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/flowplayer/modules/warning.module.js?ver=1.2.3'></script>


1	<title>Test Blog</title>
2	<link rel='stylesheet' id='wp-block-library-css' href='http://example.org/wp-includes/css/dist/block-library/style.css?ver=1.2.3-beta3-45183-src' type='text/css' media='all' />
3	<link rel='stylesheet' id='fv_flowplayer-css' href='http://example.org/wp-content/plugins/fv-wordpress-flowplayer/css/flowplayer.css?ver=1.2.3' type='text/css' media='all' />
4	+ <link rel="https://api.w.org/" href="http://example.org/index.php?rest_route=/" /><link rel="EditURI" type="application/rsd+xml" title="RSD" href="http://example.org/xmlrpc.php?rsd" />

5	<link rel="wlwmanifest" type="application/wlwmanifest+xml" href="http://example.org/wp-includes/wlwmanifest.xml" />
6	<style type="text/css">.recentcomments a{display:inline !important;padding:0 !important;margin:0 !important;}</style> <style type="text/css">
7	.flowplayer.skin-slim { background-color: #000000 !important; }

66	<li><a class="sharing-email" href="mailto:?body=Check%20out%20the%20amazing%20video%20here%3A%20http%3A%2F%2Fexample.org%2F%3Fp%3D1234" target="_blank"></a></li></ul><div><a class="sharing-link" href="http://example.org/?p=1234" target="_blank">Link</a></div><div><label><a class="embed-code-toggle" href="#"><strong>Embed</strong></a></label></div><div class="embed-code"><label>Copy and paste this HTML code into your webpage to embed.</label><textarea></textarea></div></div>
67	</div>
68
69	+ <script type='text/javascript' src='http://example.org/wp-includes/js/jquery/jquery.js?ver=1.12.4' id='jquery-js'></script>
70	+ <script type='text/javascript' id='flowplayer-js-extra'>

71	/* <![CDATA[ */
72	var fv_flowplayer_conf = {"fullscreen":"1","swf":"\/\/example.org\/wp-content\/plugins\/fv-wordpress-flowplayer\/flowplayer\/flowplayer.swf?ver=1.2.3","swfHls":"\/\/example.org\/wp-content\/plugins\/fv-wordpress-flowplayer\/flowplayer\/flowplayerhls.swf?ver=1.2.3","speeds":[0.25,0.5,0.75,1,1.25,1.5,1.75,2],"video_hash_links":"1","safety_resize":"1","volume":"0.7","sticky_video":"","sticky_place":"right-bottom","sticky_width":"380","script_hls_js":"http:\/\/example.org\/wp-content\/plugins\/fv-wordpress-flowplayer\/flowplayer\/hls.min.js?ver=1.2.3","script_dash_js":"http:\/\/example.org\/wp-content\/plugins\/fv-wordpress-flowplayer\/flowplayer\/flowplayer.dashjs.min.js?ver=1.2.3","script_dash_js_version":"2.7","hlsjs":{"startLevel":-1,"fragLoadingMaxRetry":3,"levelLoadingMaxRetry":3,"capLevelToPlayerSize":true}};
73	+ var fv_flowplayer_translations = {"0":"","1":"Video loading aborted","2":"Network error","3":"Video not properly encoded","4":"Video file not found","5":"Unsupported video","6":"Skin not found","7":"SWF file not found","8":"Subtitles not found","9":"Invalid RTMP URL","10":"Unsupported video format. Try installing Adobe Flash.","11":"Click to watch the video","12":"[This post contains video, click to play]","video_expired":"<h2>Video file expired.<br \/>Please reload the page and play it again.<\/h2>","unsupported_format":"<h2>Unsupported video format.<br \/>Please use a Flash compatible device.<\/h2>","mobile_browser_detected_1":"Mobile browser detected, serving low bandwidth video.","mobile_browser_detected_2":"Click here for full quality","live_stream_failed":"<h2>Live stream load failed.<\/h2><h3>Please try again later, perhaps the stream is currently offline.<\/h3>","live_stream_failed_2":"<h2>Live stream load failed.<\/h2><h3>Please try again later, perhaps the stream is currently offline.<\/h3>","what_is_wrong":"Please tell us what is wrong :","full_sentence":"Please give us more information (a full sentence) so we can help you better","error_JSON":"Admin: Error parsing JSON","no_support_IE9":"Admin: Video checker doesn't support IE 9.","check_failed":"Admin: Check failed.","playlist_current":"Now Playing","playlist_item_no":"Item %d.","playlist_play_all":"Play All","playlist_play_all_button":"All","playlist_replay_all":"Replay Playlist","playlist_replay_video":"Repeat Track","playlist_shuffle":"Shuffle Playlist","video_issues":"Video Issues","video_reload":"Video loading has stalled, click to reload","link_copied":"Video Link Copied to Clipboard","embed_copied":"Embed Code Copied to Clipboard","subtitles_disabled":"Subtitles disabled","subtitles_switched":"Subtitles switched to ","warning_iphone_subs":"This video has subtitles, that are not supported on your device.","warning_unstable_android":"You are using an old Android device. If you experience issues with the video please use <a href=\"https:\/\/play.google.com\/store\/apps\/details?id=org.mozilla.firefox\">Firefox<\/a>. <a target=\"_blank\" href=\"https:\/\/foliovision.com\/2017\/05\/issues-with-vimeo-on-android\">Why?<\/a>","warning_samsungbrowser":"You are using the Samsung Browser which is an older and buggy version of Google Chrome. If you experience issues with the video please use <a href=\"https:\/\/www.mozilla.org\/en-US\/firefox\/new\/\">Firefox<\/a> or other modern browser. <a target=\"_blank\" href=\"https:\/\/foliovision.com\/2017\/05\/issues-with-vimeo-on-android\">Why?<\/a>","warning_old_safari":"You are using an old Safari browser. If you experience issues with the video please use <a href=\"https:\/\/www.mozilla.org\/en-US\/firefox\/new\/\">Firefox<\/a> or other modern browser.","warning_old_chrome":"You are using an old Chrome browser. Please make sure you use the latest version.","warning_old_firefox":"You are using an old Firefox browser. Please make sure you use the latest version.","warning_old_ie":"You are using a deprecated browser. If you experience issues with the video please use <a href=\"https:\/\/www.mozilla.org\/en-US\/firefox\/new\/\">Firefox<\/a> or other modern browser."};
74	var fv_fp_ajaxurl = "http:\/\/example.org\/wp-admin\/admin-ajax.php";
75	var fv_flowplayer_playlists = [];
76	/* ]]> */
77	</script>
78	+ <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>
79	+ <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>
80	+ <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>
81	+ <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>
82	+ <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>
83	+ <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>
84	+ <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>
85	+ <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>
86	+ <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>
87	+ <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>
88	+ <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>
89	+ <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>
90	+ <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>
91	+ <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>
92	+ <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>
93	+ <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>
94	+ <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>
95	+ <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>
96	+ <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>
97	+ <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>
98	+ <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>
99	+ <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>
100	+ <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>
101	+ <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>
102	+ <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>
103	+ <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>
104	+ <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>
105	+ <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>
106	+ <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>
107	+ <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>
108	+ <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>
109	+ <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>
110	+ <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>
111	+ <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>
112	+ <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>
113	+ <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>
114	+ <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>
115	+ <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>

test/integration/frontend/videoPositionSavingTest.php CHANGED Viewed

	@@ -135,7 +135,7 @@ final class FV_Player_videoPositionSavingTestCase extends FV_Player_Ajax_UnitTes
135	</div>
136	<div class=\"fp-playlist-external fv-playlist-design-2017 fp-playlist-horizontal skin-slim\" rel=\"some-test-hash\">
137	<a href='#' data-item='{\"sources\":[{\"src\":\"https:\/\/cdn.site.com\/1.mp4\",\"type\":\"video\/mp4\"}]}'><div class='fvp-playlist-thumb-img'><div class='fvp-playlist-thumb-img no-image'></div></div></a>
138	- <a href='#' data-item='{\"sources\":[{\"src\":\"https:\/\/cdn.site.com\/2.mp4\",\"type\":\"video\/mp4\",\"position\"~~:\"~~12\"}]}'><div class='fvp-playlist-thumb-img'><div class='fvp-playlist-thumb-img no-image'></div></div></a>
139	<a href='#' data-item='{\"sources\":[{\"src\":\"https:\/\/cdn.site.com\/3.mp4\",\"type\":\"video\/mp4\"}]}'><div class='fvp-playlist-thumb-img'><div class='fvp-playlist-thumb-img no-image'></div></div></a>
140	</div>
141


135	</div>
136	<div class=\"fp-playlist-external fv-playlist-design-2017 fp-playlist-horizontal skin-slim\" rel=\"some-test-hash\">
137	<a href='#' data-item='{\"sources\":[{\"src\":\"https:\/\/cdn.site.com\/1.mp4\",\"type\":\"video\/mp4\"}]}'><div class='fvp-playlist-thumb-img'><div class='fvp-playlist-thumb-img no-image'></div></div></a>
138	+ <a href='#' data-item='{\"sources\":[{\"src\":\"https:\/\/cdn.site.com\/2.mp4\",\"type\":\"video\/mp4\",\"position\":12}]}'><div class='fvp-playlist-thumb-img'><div class='fvp-playlist-thumb-img no-image'></div></div></a>
139	<a href='#' data-item='{\"sources\":[{\"src\":\"https:\/\/cdn.site.com\/3.mp4\",\"type\":\"video\/mp4\"}]}'><div class='fvp-playlist-thumb-img'><div class='fvp-playlist-thumb-img no-image'></div></div></a>
140	</div>
141

test/unit/controller/frontendTest.php CHANGED Viewed

	@@ -81,10 +81,6 @@ final class FV_Player_Controller extends TestCase {
81	global $fv_fp;
82	$fv_fp = new flowplayer();
83
84	- // todo: fix in core perhaps
85	- $fv_fp->aAds = array();
86	- $fv_fp->aPopups = array();
87	-
88	include_once "../../controller/frontend.php";
89	}
90
	@@ -158,8 +154,7 @@ Localizing flowplayer with fv_flowplayer_translations = Array
158	[video_expired] => <h2>Video file expired.<br />Please reload the page and play it again.</h2>
159	[unsupported_format] => <h2>Unsupported video format.<br />Please use a Flash compatible device.</h2>
160	[mobile_browser_detected_1] => Mobile browser detected, serving low bandwidth video.
161	- [mobile_browser_detected_2] => Click here
162	- [mobile_browser_detected_3] => for full quality.
163	[live_stream_failed] => <h2>Live stream load failed.</h2><h3>Please try again later, perhaps the stream is currently offline.</h3>
164	[live_stream_failed_2] => <h2>Live stream load failed.</h2><h3>Please try again later, perhaps the stream is currently offline.</h3>
165	[what_is_wrong] => Please tell us what is wrong :


81	global $fv_fp;
82	$fv_fp = new flowplayer();
83




84	include_once "../../controller/frontend.php";
85	}
86

154	[video_expired] => <h2>Video file expired.<br />Please reload the page and play it again.</h2>
155	[unsupported_format] => <h2>Unsupported video format.<br />Please use a Flash compatible device.</h2>
156	[mobile_browser_detected_1] => Mobile browser detected, serving low bandwidth video.
157	+ [mobile_browser_detected_2] => Click here for full quality

158	[live_stream_failed] => <h2>Live stream load failed.</h2><h3>Please try again later, perhaps the stream is currently offline.</h3>
159	[live_stream_failed_2] => <h2>Live stream load failed.</h2><h3>Please try again later, perhaps the stream is currently offline.</h3>
160	[what_is_wrong] => Please tell us what is wrong :

view/admin.php CHANGED Viewed

	@@ -1986,7 +1986,7 @@ jQuery(document).ready(function(){
1986	}
1987
1988	jQuery('#fv_flowplayer_admin_tabs .nav-tab').removeClass('nav-tab-active');
1989	- jQuery('[href=#'+anchor+']').addClass('nav-tab-active');
1990	jQuery('#dashboard-widgets .postbox-container').hide();
1991	jQuery('#' + anchor).show();
1992	});
	@@ -1996,7 +1996,7 @@ jQuery('#fv_flowplayer_admin_tabs a').on('click',function(e){
1996	window.location.hash = e.target.hash;
1997	var anchor = jQuery(this).attr('href').substring(1);
1998	jQuery('#fv_flowplayer_admin_tabs .nav-tab').removeClass('nav-tab-active');
1999	- jQuery('[href=#'+anchor+']').addClass('nav-tab-active');
2000	jQuery('#dashboard-widgets .postbox-container').hide();
2001	jQuery('#' + anchor).show();
2002	});
	@@ -2005,7 +2005,7 @@ jQuery('#normal-sortables .button-primary').on('click',function(e){
2005	if ('fv-wp-flowplayer-submit' == this.name) {
2006	// store windows scroll position, so we can return to the same spot after reload
2007	if (localStorage) {
2008	- localStorage["fv_posStorage"] = $(window).scrollTop();
2009	}
2010	}
2011
	@@ -2030,7 +2030,7 @@ jQuery('a.fv-settings-anchor').on('click',function(e){
2030	var el = jQuery(id);
2031	if(el.length){
2032	var tab = el.parents('.postbox-container').attr('id');
2033	- jQuery('#fv_flowplayer_admin_tabs').find('a[href=#'+tab+']').click()
2034	}
2035	}
2036	});


1986	}
1987
1988	jQuery('#fv_flowplayer_admin_tabs .nav-tab').removeClass('nav-tab-active');
1989	+ jQuery('[href=\\#'+anchor+']').addClass('nav-tab-active');
1990	jQuery('#dashboard-widgets .postbox-container').hide();
1991	jQuery('#' + anchor).show();
1992	});

1996	window.location.hash = e.target.hash;
1997	var anchor = jQuery(this).attr('href').substring(1);
1998	jQuery('#fv_flowplayer_admin_tabs .nav-tab').removeClass('nav-tab-active');
1999	+ jQuery('[href=\\#'+anchor+']').addClass('nav-tab-active');
2000	jQuery('#dashboard-widgets .postbox-container').hide();
2001	jQuery('#' + anchor).show();
2002	});

2005	if ('fv-wp-flowplayer-submit' == this.name) {
2006	// store windows scroll position, so we can return to the same spot after reload
2007	if (localStorage) {
2008	+ localStorage["fv_posStorage"] = jQuery(window).scrollTop();
2009	}
2010	}
2011

2030	var el = jQuery(id);
2031	if(el.length){
2032	var tab = el.parents('.postbox-container').attr('id');
2033	+ jQuery('#fv_flowplayer_admin_tabs').find('a[href=\\#'+tab+']').click()
2034	}
2035	}
2036	});

view/wizard.php CHANGED Viewed

	@@ -362,6 +362,9 @@ var fv_flowplayer_preview_nonce = '<?php echo wp_create_nonce( "fv-player-previe
362	<a class="fv_flowplayer_language_add_link" style="outline: 0" onclick="return fv_flowplayer_language_add(false, <?php echo ( isset($fv_flowplayer_conf["interface"]["playlist_captions"]) && $fv_flowplayer_conf["interface"]["playlist_captions"] == 'true' ) ? 'true' : 'false'; ?>)" class="partial-underline" href="#"><span class="add-subtitle-lang">+</span> <?php _e('Add Another Language', 'fv_flowplayer'); ?></a>
363	</td>
364	</tr>



365	<tr class="submit-button-wrapper">
366	<td></td>
367	<td>


362	<a class="fv_flowplayer_language_add_link" style="outline: 0" onclick="return fv_flowplayer_language_add(false, <?php echo ( isset($fv_flowplayer_conf["interface"]["playlist_captions"]) && $fv_flowplayer_conf["interface"]["playlist_captions"] == 'true' ) ? 'true' : 'false'; ?>)" class="partial-underline" href="#"><span class="add-subtitle-lang">+</span> <?php _e('Add Another Language', 'fv_flowplayer'); ?></a>
363	</td>
364	</tr>
365	+
366	+ <?php do_action('fv_flowplayer_shortcode_editor_subtitles_tab_append'); ?>
367	+
368	<tr class="submit-button-wrapper">
369	<td></td>
370	<td>