fix BUG-53 video/image viewer switching had spacing and name wrong
This commit is contained in:
@@ -51,12 +51,12 @@ function DrawImg()
|
||||
// show (or not) the whole figcaption with fname in it - based on state of fname_toggle
|
||||
if( $('#fname_toggle').prop('checked' ) )
|
||||
{
|
||||
$('.figcaption').attr('style', 'display:show' )
|
||||
// reset fname for new image (if navigated left/right to get here)
|
||||
$('#fname').html(objs[current].name)
|
||||
$('.figcaption').show()
|
||||
}
|
||||
else
|
||||
$('.figcaption').attr('style', 'display:none' )
|
||||
$('.figcaption').hide()
|
||||
|
||||
// if we have faces, the enable the toggles, otherwise disable them
|
||||
// and reset model select too
|
||||
@@ -154,8 +154,11 @@ function ViewImageOrVideo()
|
||||
if( objs[current].type == 'Image' )
|
||||
{
|
||||
im.src='../' + objs[current].url
|
||||
$('#video').hide()
|
||||
$('#vid-caption').hide()
|
||||
$('#video_div').hide()
|
||||
//$('#vid-cap').hide()
|
||||
if( $('#fname_toggle').prop('checked' ) )
|
||||
$('#img-cap').show()
|
||||
$('#fname_i').html(objs[current].name)
|
||||
$('#figure').show()
|
||||
if( fullscreen )
|
||||
$('#canvas').get(0).requestFullscreen()
|
||||
@@ -164,8 +167,11 @@ function ViewImageOrVideo()
|
||||
{
|
||||
$('#video').prop('src', '../' + objs[current].url )
|
||||
$('#figure').hide()
|
||||
$('#video').show()
|
||||
$('#vid-caption').show()
|
||||
$('#fname_v').html(objs[current].name)
|
||||
if( $('#fname_toggle').prop('checked' ) )
|
||||
$('#img-cap').hide()
|
||||
$('#video_div').show()
|
||||
//$('#vid-cap').show()
|
||||
ResizeVideo()
|
||||
if( fullscreen )
|
||||
$('#video').get(0).requestFullscreen()
|
||||
|
||||
Reference in New Issue
Block a user