diff --git a/app/static/js/ascroll.js b/app/static/js/ascroll.js index b69620e..0e30230 100644 --- a/app/static/js/ascroll.js +++ b/app/static/js/ascroll.js @@ -71,17 +71,9 @@ function timeupdate(event) { var ain = parseFloat(annot.dataset.in) var aout = parseFloat(annot.dataset.out) if (ain <= currentTime && aout > currentTime) { - if (annot.classList.contains('single')) { - annot.style.opacity = '1' - } else { - annot.style.display = '' - } + annot.style.display = '' } else { - if (annot.classList.contains('single')) { - annot.style.opacity = '0' - } else { - annot.style.display = 'none' - } + annot.style.display = 'none' } }) @@ -141,11 +133,6 @@ function formatInfo(config, ascroll) { } title.onclick = event => { section.style.display = section.style.display == "none" ? "block" : "none" - if (section.style.display == "block") { - section.querySelectorAll("pandora-scroll").forEach(ps => { - ps.updateAnnotationHeight() - }) - } div.querySelectorAll("h3.toggle").forEach(other => { if (other != title) { var osection = other.nextElementSibling @@ -422,7 +409,6 @@ function renderSingleMode(config) { config.root.appendChild(div) var frame = div.querySelector('.frame') var text = div.querySelector('.text') - text.style.position = 'relative' var first = config.annotations[0] if (text && first) { var color1 = `hsl(${first.color1.hue}, 60%, 15%)` @@ -441,28 +427,13 @@ function renderSingleMode(config) { values = values.join('

') var annot = document.createElement('div') annot.classList.add('annotation') - annot.classList.add('single') annot.innerHTML = values //console.log(clip) annot.dataset['in'] = clip.annotations[0]['in'] annot.dataset['out'] = clip.annotations[0]['out'] - annot.style.opacity = '0' - annot.style.position = 'absolute' + annot.style.display = 'none' text.appendChild(annot) }) - if (config.annotations.length) { - text.style.height = '72px'; - } - setTimeout(() => { - var height = 0 - text.querySelectorAll('.annotation.single').forEach(annotation => { - var rect = annotation.getBoundingClientRect() - if (rect.height > height) { - height = rect.height - } - }) - text.style.height = height + 'px'; - }, 50) if (frame) { updatePlayer(config.video, frame, config['in'], config['out'], src, config) } diff --git a/app/static/js/pandora-scroll.js b/app/static/js/pandora-scroll.js index 3ddab24..3892b98 100644 --- a/app/static/js/pandora-scroll.js +++ b/app/static/js/pandora-scroll.js @@ -29,18 +29,6 @@ class PandoraScroll extends HTMLElement { video.muted = true }) } - this.updateAnnotationHeight = function() { - var height = 0 - var text = shadow.querySelector('.text') - text.querySelectorAll('.annotation.single').forEach(annotation => { - var rect = annotation.getBoundingClientRect() - console.log(annotation, rect.height) - if (rect.height > height) { - height = rect.height - } - }) - text.style.height = height + 'px'; - } }