From dd29540578098b2a4f99531e2365188818f8c155 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Wed, 26 Feb 2014 12:19:26 +0100 Subject: [PATCH] Update flowplayer version --- lib/conf.d/minifyGroupsConfig.php | 6 +- templates/web/client/index.html.twig | 2 +- templates/web/common/thumbnail.html.twig | 8 +- templates/web/overview.html.twig | 2 +- www/include/jslibs/flowplayer-3.1.4.min.js | 24 --- www/include/jslibs/flowplayer-3.1.5.swf | Bin 110762 -> 0 bytes .../jslibs/flowplayer.controls-3.1.5.swf | Bin 27007 -> 0 bytes www/include/jslibs/flowplayer/LICENSE.txt | 2 +- www/include/jslibs/flowplayer/README.txt | 171 +++++++++++++++++- .../flowplayer/flowplayer-3.2.11.min.js | 24 --- .../jslibs/flowplayer/flowplayer-3.2.12.swf | Bin 126406 -> 0 bytes .../flowplayer/flowplayer-3.2.13.min.js | 22 +++ .../jslibs/flowplayer/flowplayer-3.2.18.swf | Bin 0 -> 129772 bytes .../flowplayer/flowplayer.controls-3.2.12.swf | Bin 38265 -> 0 bytes .../flowplayer/flowplayer.controls-3.2.16.swf | Bin 0 -> 38270 bytes .../flowplayer.pseudostreaming-3.2.9.swf | Bin 4715 -> 0 bytes .../flowplayer/pseudostreaming/LICENSE.txt | 22 +++ .../flowplayer/pseudostreaming/README.txt | 130 +++++++++++++ .../flowplayer.pseudostreaming-3.2.13.swf | Bin 0 -> 4850 bytes ...layer.pseudostreaming-byterange-3.2.13.swf | Bin 0 -> 171038 bytes 20 files changed, 349 insertions(+), 64 deletions(-) delete mode 100644 www/include/jslibs/flowplayer-3.1.4.min.js delete mode 100644 www/include/jslibs/flowplayer-3.1.5.swf delete mode 100644 www/include/jslibs/flowplayer.controls-3.1.5.swf delete mode 100644 www/include/jslibs/flowplayer/flowplayer-3.2.11.min.js delete mode 100644 www/include/jslibs/flowplayer/flowplayer-3.2.12.swf create mode 100644 www/include/jslibs/flowplayer/flowplayer-3.2.13.min.js create mode 100644 www/include/jslibs/flowplayer/flowplayer-3.2.18.swf delete mode 100644 www/include/jslibs/flowplayer/flowplayer.controls-3.2.12.swf create mode 100644 www/include/jslibs/flowplayer/flowplayer.controls-3.2.16.swf delete mode 100644 www/include/jslibs/flowplayer/flowplayer.pseudostreaming-3.2.9.swf create mode 100644 www/include/jslibs/flowplayer/pseudostreaming/LICENSE.txt create mode 100644 www/include/jslibs/flowplayer/pseudostreaming/README.txt create mode 100644 www/include/jslibs/flowplayer/pseudostreaming/flowplayer.pseudostreaming-3.2.13.swf create mode 100644 www/include/jslibs/flowplayer/pseudostreaming/flowplayer.pseudostreaming-byterange-3.2.13.swf diff --git a/lib/conf.d/minifyGroupsConfig.php b/lib/conf.d/minifyGroupsConfig.php index 881c626f09..320b0dd5f2 100644 --- a/lib/conf.d/minifyGroupsConfig.php +++ b/lib/conf.d/minifyGroupsConfig.php @@ -98,7 +98,7 @@ $groups = array( , '//skins/prod/publicator.js' , '//include/jslibs/jquery.sprintf.1.0.3.js' , '//include/jquery.tooltip.js' - , '//include/jslibs/flowplayer/flowplayer-3.2.11.min.js' + , '//include/jslibs/flowplayer/flowplayer-3.2.13.min.js' , '//include/jquery.p4.preview.js' , '//skins/prod/jquery.edit.js' , '//include/jslibs/jquery.color.animation.js' @@ -125,7 +125,7 @@ $groups = array( , '//include/jquery.common.js' , '//skins/prod/jquery.Dialog.js' , '//skins/lightbox/jquery.lightbox.js' - , '//include/jslibs/flowplayer/flowplayer-3.2.11.min.js' + , '//include/jslibs/flowplayer/flowplayer-3.2.13.min.js' ), 'lightboxie6' => array( '//include/jslibs/jquery.mousewheel.js' @@ -137,7 +137,7 @@ $groups = array( , '//include/jquery.common.js' , '//skins/prod/jquery.Dialog.js' , '//skins/lightbox/jquery.lightbox.ie6.js' - , '//include/jslibs/flowplayer/flowplayer-3.2.11.min.js' + , '//include/jslibs/flowplayer/flowplayer-3.2.13.min.js' ), 'uploadflash' => array( '//include/jslibs/SWFUpload/swfupload.js' diff --git a/templates/web/client/index.html.twig b/templates/web/client/index.html.twig index 5a1db83769..c6e8008818 100644 --- a/templates/web/client/index.html.twig +++ b/templates/web/client/index.html.twig @@ -41,7 +41,7 @@ - + diff --git a/templates/web/common/thumbnail.html.twig b/templates/web/common/thumbnail.html.twig index 4a5f265e8e..feec524aff 100644 --- a/templates/web/common/thumbnail.html.twig +++ b/templates/web/common/thumbnail.html.twig @@ -63,10 +63,10 @@ {% elseif record_type == 'FLEXPAPER' %} @@ -170,9 +170,9 @@ {% elseif record_type == 'FLEXPAPER' %} {% set random = thumbnail.get_random() %} diff --git a/templates/web/overview.html.twig b/templates/web/overview.html.twig index 61aa6523cd..ba2176a3f4 100644 --- a/templates/web/overview.html.twig +++ b/templates/web/overview.html.twig @@ -62,7 +62,7 @@ {% block javascript %} - +