fix bug with 2 captions when video caption has to be outside <video> tag
This commit is contained in:
@@ -155,6 +155,7 @@ function ViewImageOrVideo()
|
|||||||
{
|
{
|
||||||
im.src='http://mara.ddp.net:5000/' + objs[current].url
|
im.src='http://mara.ddp.net:5000/' + objs[current].url
|
||||||
$('#video').hide()
|
$('#video').hide()
|
||||||
|
$('#vid-caption').hide()
|
||||||
$('#figure').show()
|
$('#figure').show()
|
||||||
if( fullscreen )
|
if( fullscreen )
|
||||||
$('#canvas').get(0).requestFullscreen()
|
$('#canvas').get(0).requestFullscreen()
|
||||||
@@ -164,6 +165,7 @@ function ViewImageOrVideo()
|
|||||||
$('#video').prop('src', 'http://mara.ddp.net:5000/' + objs[current].url )
|
$('#video').prop('src', 'http://mara.ddp.net:5000/' + objs[current].url )
|
||||||
$('#figure').hide()
|
$('#figure').hide()
|
||||||
$('#video').show()
|
$('#video').show()
|
||||||
|
$('#vid-caption').show()
|
||||||
ResizeVideo()
|
ResizeVideo()
|
||||||
if( fullscreen )
|
if( fullscreen )
|
||||||
$('#video').get(0).requestFullscreen()
|
$('#video').get(0).requestFullscreen()
|
||||||
|
|||||||
Reference in New Issue
Block a user