flicker
This commit is contained in:
parent
7e9cf186dd
commit
f703342b36
8
test.css
8
test.css
|
@ -35,12 +35,13 @@ h1 {
|
|||
position: fixed;
|
||||
top: 0px;
|
||||
right: 0px;
|
||||
background: #000;
|
||||
background-color: rgb(187,187,87);
|
||||
background-color: rgba(187,187,87,1);
|
||||
bottom: 0px;
|
||||
}
|
||||
|
||||
#aboutTxt {
|
||||
color: #ccc;
|
||||
color: #363636;
|
||||
padding: 15px;
|
||||
}
|
||||
|
||||
|
@ -53,11 +54,12 @@ h1 {
|
|||
}
|
||||
|
||||
.annotationText {
|
||||
color: #ccc;
|
||||
color: #363636;
|
||||
margin-top: 15px;
|
||||
margin-bottom: 15px;
|
||||
font-size: 13px;
|
||||
height: 35%;
|
||||
overflow-y: auto;
|
||||
width: 90%;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
|
|
9
test.js
9
test.js
|
@ -125,7 +125,9 @@ function setupPadmaLink(videoObj, data) {
|
|||
}
|
||||
// GLOBAL_FOO = allLayers;
|
||||
var transcript = filterLayersByTracks(allLayers, ['transcript'])[0].value_html;
|
||||
$('.annotationText').html(transcript);
|
||||
if (transcript != $('.annotationText').html()) {
|
||||
$('.annotationText').html(transcript);
|
||||
}
|
||||
}, 150);
|
||||
});
|
||||
|
||||
|
@ -146,10 +148,9 @@ function setupPadmaLink(videoObj, data) {
|
|||
//All functions that destroy the video must call this to ensure clean-ups are handled
|
||||
//FIXME: actually handle the cleanups.
|
||||
// parameter is a padmaVideo object.
|
||||
function cleanupVideo(video) {
|
||||
function cleanupVideo(videoObj) {
|
||||
$('video')[0].pause();
|
||||
// clearInterval(video.interval);
|
||||
clearInterval(videoObj.interval);
|
||||
$('.padmaViewer').remove();
|
||||
|
||||
padmaContainer.data("currentVideo", false);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user