From f703342b36dedd97e88dde54c856c462c1d6877b Mon Sep 17 00:00:00 2001 From: sanj Date: Sat, 6 Nov 2010 22:40:29 +0530 Subject: [PATCH] flicker --- test.css | 8 +++++--- test.js | 9 +++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/test.css b/test.css index 5f9acd4..ba8e8bd 100644 --- a/test.css +++ b/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; diff --git a/test.js b/test.js index d265b6f..59cafff 100644 --- a/test.js +++ b/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); }