hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 04:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lightbox video display

Browse Source
This commit is contained in:
Romain Neutron
2012-07-17 16:42:27 +02:00
parent d689dc0639
commit c1ec4d5303
5 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
templates/web/common/HTML5Video.html.twig
View File

@@ -34,9 +34,10 @@
_V_("{{ unique_id }}", {}, function(){ _V_("{{ unique_id }}", {}, function(){
var player = this; var player = this;
$('#{{ unique_id }}').parent().bind('resize-video-js', function(){ $('#{{ unique_id }}').bind('resize-video-js', function(){
player.width($(this).width()); var parent = $(this).parent();
player.height($(this).height()); player.width(parent.width());
player.height(parent.height());
}); });
$('#{{ unique_id }}').bind('unload-video-js', function(){ $('#{{ unique_id }}').bind('unload-video-js', function(){

1
templates/web/lightbox/index.twig
View File

@@ -11,6 +11,7 @@
{% block stylesheet %} {% block stylesheet %}
<link type="text/css" rel="stylesheet" <link type="text/css" rel="stylesheet"
href="/include/minify/f=include/jslibs/yui2.8/build/reset/reset.css,include/jslibs/jquery.contextmenu.css,include/jslibs/jquery-ui-1.8.17/css/ui-lightness/jquery-ui-1.8.17.custom.css,skins/lightbox/lightbox.css" media="screen"/> href="/include/minify/f=include/jslibs/yui2.8/build/reset/reset.css,include/jslibs/jquery.contextmenu.css,include/jslibs/jquery-ui-1.8.17/css/ui-lightness/jquery-ui-1.8.17.custom.css,skins/lightbox/lightbox.css" media="screen"/>
<link type="text/css" rel="stylesheet" href="{{registry.get('GV_STATIC_URL')}}/include/jslibs/video-js/video-js.css">
{% endblock %} {% endblock %}
{% block icon %} {% block icon %}

3
templates/web/lightbox/validate.twig
View File

@@ -13,7 +13,8 @@
{% block stylesheet %} {% block stylesheet %}
<link type="text/css" rel="stylesheet" <link type="text/css" rel="stylesheet"
href="/include/minify/f=include/jslibs/yui2.8/build/reset/reset.css,include/jslibs/jquery.contextmenu.css,include/jslibs/jquery-ui-1.8.17/css/ui-lightness/jquery-ui-1.8.17.custom.css,skins/lightbox/lightbox.css" media="screen"/> href="/include/minify/f=include/jslibs/yui2.8/build/reset/reset.css,include/jslibs/jquery.contextmenu.css,include/jslibs/jquery-ui-1.8.17/css/ui-lightness/jquery-ui-1.8.17.custom.css,skins/lightbox/lightbox.css" media="screen"/>
{% endblock %} <link type="text/css" rel="stylesheet" href="{{registry.get('GV_STATIC_URL')}}/include/jslibs/video-js/video-js.css">
{% endblock %}

2
www/include/jquery.p4.preview.js
View File

@@ -498,7 +498,7 @@ function setPreview(){
top: t, top: t,
left: l left: l
}).attr('width',w).attr('height',h); }).attr('width',w).attr('height',h);
$('#PREVIEWIMGCONT .record').trigger('resize-video-js'); $('#PREVIEWIMGCONT .videoTips.video-js').trigger('resize-video-js');
} }
function classicMode(){ function classicMode(){

13
www/skins/lightbox/jquery.lightbox.js
View File

@@ -363,6 +363,8 @@ function scid_click(event, el)
.empty() .empty()
.append(data.options_html); .append(data.options_html);
$('.videoTips.video-js', $('.container', container)).trigger('unload-video-js');
$('.container', container).empty() $('.container', container).empty()
.append(data.preview+data.selector_html+data.note_html); .append(data.preview+data.selector_html+data.note_html);
@@ -1017,7 +1019,14 @@ function set_image_position(smooth, image, width, height, container, callback)
} }
if(typeof callback == 'undefined') if(typeof callback == 'undefined')
{ {
callback = function(){}; callback = function(){
$('.videoTips.video-js', $(image).closest('.container')).trigger('resize-video-js');
};
} else {
callback = function(){
$('.videoTips.video-js', $(image).closest('.container')).trigger('resize-video-js');
callback();
};
} }
dimensions.width = width; dimensions.width = width;
@@ -1030,7 +1039,7 @@ function set_image_position(smooth, image, width, height, container, callback)
else else
{ {
$(image).css(dimensions); $(image).css(dimensions);
callback; callback();
} }
} }