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

Fix Video JS display

Browse Source
This commit is contained in:
grosroro
2012-06-01 19:37:58 +02:00
committed by Romain Neutron
parent 86c0021953
commit 9ca8625aa2
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/media/subdef.class.php
View File

@@ -298,7 +298,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
if ( ! file_exists($this->path . $this->file)) { if ( ! file_exists($this->path . $this->file)) {
$this->path = $registry->get('GV_RootPath') . 'www/skins/icons/'; $this->path = $registry->get('GV_RootPath') . 'www/skins/icons/';
$this->file = 'substitution.png'; $this->file = 'substitution.png';
$this->url = '/skins/icons/substitution/' . $this->file; $this->url = $this->path . $this->file;
} }
return $this; return $this;

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

@@ -527,4 +527,8 @@ function closePreview(){
cancelPreview(); cancelPreview();
$(this).dequeue(); $(this).dequeue();
}); });
$.each($('#PREVIEWBOX video'), function(i,el){
_V_($(el).attr('id')).destroy();
});
} }

4
www/include/jquery.tooltip.js
View File

@@ -585,6 +585,7 @@
{ {
$.tooltip.ajaxRequest.abort(); $.tooltip.ajaxRequest.abort();
} }
helper.body.empty();
$.tooltip.current = null; $.tooltip.current = null;
function complete() { function complete() {
helper.parent.removeClass( tsettings.extraClass ).hide().css("opacity", ""); helper.parent.removeClass( tsettings.extraClass ).hide().css("opacity", "");
@@ -609,6 +610,9 @@ function unfix_tooltip()
$.tooltip.visible = false; $.tooltip.visible = false;
$.tooltip.current = null; $.tooltip.current = null;
$('#tooltip').hide(); $('#tooltip').hide();
$.each($('#tooltip video'), function(i,el){
_V_($(el).attr('id')).destroy();
});
$('#tooltip .tooltip_closer').hide(); $('#tooltip .tooltip_closer').hide();
hideOverlay('_tooltip'); hideOverlay('_tooltip');
} }