diff --git a/lib/classes/media/subdef.class.php b/lib/classes/media/subdef.class.php index b59d304254..5c49df4057 100644 --- a/lib/classes/media/subdef.class.php +++ b/lib/classes/media/subdef.class.php @@ -298,7 +298,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface if ( ! file_exists($this->path . $this->file)) { $this->path = $registry->get('GV_RootPath') . 'www/skins/icons/'; $this->file = 'substitution.png'; - $this->url = '/skins/icons/substitution/' . $this->file; + $this->url = $this->path . $this->file; } return $this; diff --git a/www/include/jquery.p4.preview.js b/www/include/jquery.p4.preview.js index 3e579a601e..cf88443189 100644 --- a/www/include/jquery.p4.preview.js +++ b/www/include/jquery.p4.preview.js @@ -527,4 +527,8 @@ function closePreview(){ cancelPreview(); $(this).dequeue(); }); + + $.each($('#PREVIEWBOX video'), function(i,el){ + _V_($(el).attr('id')).destroy(); + }); } diff --git a/www/include/jquery.tooltip.js b/www/include/jquery.tooltip.js index 256366d238..a304d641f0 100644 --- a/www/include/jquery.tooltip.js +++ b/www/include/jquery.tooltip.js @@ -585,6 +585,7 @@ { $.tooltip.ajaxRequest.abort(); } + helper.body.empty(); $.tooltip.current = null; function complete() { helper.parent.removeClass( tsettings.extraClass ).hide().css("opacity", ""); @@ -609,6 +610,9 @@ function unfix_tooltip() $.tooltip.visible = false; $.tooltip.current = null; $('#tooltip').hide(); + $.each($('#tooltip video'), function(i,el){ + _V_($(el).attr('id')).destroy(); + }); $('#tooltip .tooltip_closer').hide(); hideOverlay('_tooltip'); }