CAMP/padmaEssay
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

flicker

Browse Source
This commit is contained in:
sanj 2010-11-06 22:40:29 +05:30
parent 7e9cf186dd
commit f703342b36
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test.css
View File

@ -35,12 +35,13 @@ h1 {
position: fixed; position: fixed;
top: 0px; top: 0px;
right: 0px; right: 0px;
background: #000; background-color: rgb(187,187,87);
background-color: rgba(187,187,87,1);
bottom: 0px; bottom: 0px;
} }
#aboutTxt { #aboutTxt {
color: #ccc; color: #363636;
padding: 15px; padding: 15px;
} }
@ -53,11 +54,12 @@ h1 {
} }
.annotationText { .annotationText {
color: #ccc; color: #363636;
margin-top: 15px; margin-top: 15px;
margin-bottom: 15px; margin-bottom: 15px;
font-size: 13px; font-size: 13px;
height: 35%; height: 35%;
overflow-y: auto;
width: 90%; width: 90%;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;

7
test.js
View File

@ -125,7 +125,9 @@ function setupPadmaLink(videoObj, data) {
} }
// GLOBAL_FOO = allLayers; // GLOBAL_FOO = allLayers;
var transcript = filterLayersByTracks(allLayers, ['transcript'])[0].value_html; var transcript = filterLayersByTracks(allLayers, ['transcript'])[0].value_html;
if (transcript != $('.annotationText').html()) {
$('.annotationText').html(transcript); $('.annotationText').html(transcript);
}
}, 150); }, 150);
}); });
@ -146,10 +148,9 @@ function setupPadmaLink(videoObj, data) {
//All functions that destroy the video must call this to ensure clean-ups are handled //All functions that destroy the video must call this to ensure clean-ups are handled
//FIXME: actually handle the cleanups. //FIXME: actually handle the cleanups.
// parameter is a padmaVideo object. // parameter is a padmaVideo object.
function cleanupVideo(video) { function cleanupVideo(videoObj) {
$('video')[0].pause(); $('video')[0].pause();
// clearInterval(video.interval); clearInterval(videoObj.interval);
$('.padmaViewer').remove(); $('.padmaViewer').remove();
padmaContainer.data("currentVideo", false); padmaContainer.data("currentVideo", false);
} }