diff --git a/app/static/css/partials/_pandora_scroll.scss b/app/static/css/partials/_pandora_scroll.scss
index 89a513a..84023bc 100644
--- a/app/static/css/partials/_pandora_scroll.scss
+++ b/app/static/css/partials/_pandora_scroll.scss
@@ -49,24 +49,6 @@
//transition: opacity 0.4s;
}
- .text {
- .layer {
- .title {
- display: none;
- }
- &.active {
- .title {
- display: block
- }
- padding-bottom: 4px;
- }
- .annotation {
- &.active {
- padding-bottom: 4px;
- }
- }
- }
- }
.annotation {
//min-height: 100vh;
.frame {
diff --git a/app/static/js/ascroll.js b/app/static/js/ascroll.js
index 790d78c..5366d13 100644
--- a/app/static/js/ascroll.js
+++ b/app/static/js/ascroll.js
@@ -72,16 +72,11 @@ function timeupdate(event) {
var aout = parseFloat(annot.dataset.out)
if (ain <= currentTime && aout > currentTime) {
annot.style.display = ''
- annot.classList.add('active')
- annot.parentElement.classList.add('active')
} else {
annot.style.display = 'none'
- annot.classList.remove('active')
- if (!annot.parentElement.querySelector('.active')) {
- annot.parentElement.classList.remove('active')
- }
}
})
+
}
if (event.target.currentTime >= out_) {
/*
@@ -450,36 +445,20 @@ function renderSingleMode(config) {
updatePlayer(config.video, frame, config['in'], config['out'], src, config)
}
}))
- config.layers.forEach(layer => {
- var text_layer = document.createElement('div')
- text_layer.classList.add('layer')
- text_layer.classList.add(layer)
- var title = document.createElement('div')
- title.classList.add('title')
- title.innerText = layer.charAt(0).toUpperCase() + layer.slice(1);
- text_layer.appendChild(title)
- config.annotations.forEach(clip => {
- var values = []
- clip.annotations.forEach(a => {
- if (a.layer == layer) {
- values.push(a.value.replace(/src="\//g, `src="${streamPrefix}/`).replace(/href="\//g, `href="${pandoraURL}/`))
- }
- })
- if (values.length) {
- values = values.join('
')
- var annot = document.createElement('div')
- annot.classList.add('annotation')
- annot.innerHTML = values
- //console.log(clip)
- annot.dataset['in'] = clip.annotations[0]['in']
- annot.dataset['out'] = clip.annotations[0]['out']
- annot.style.display = 'none'
- text_layer.appendChild(annot)
- }
+ config.annotations.forEach(clip => {
+ var values = []
+ clip.annotations.forEach(a => {
+ values.push(a.value.replace(/src="\//g, `src="${streamPrefix}/`).replace(/href="\//g, `href="${pandoraURL}/`))
})
- if (text_layer.querySelector('.annotation')) {
- text.appendChild(text_layer)
- }
+ values = values.join('
')
+ var annot = document.createElement('div')
+ annot.classList.add('annotation')
+ annot.innerHTML = values
+ //console.log(clip)
+ annot.dataset['in'] = clip.annotations[0]['in']
+ annot.dataset['out'] = clip.annotations[0]['out']
+ annot.style.display = 'none'
+ text.appendChild(annot)
})
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 05c7abc..0a503e3 100644
--- a/app/static/js/pandora-scroll.js
+++ b/app/static/js/pandora-scroll.js
@@ -75,9 +75,9 @@ class PandoraScroll extends HTMLElement {
config[a.name] = a.value != 'false'
}
if (a.name == 'layers') {
- config[a.name] = a.value.trim().split(' ')
+ config[a.name] = a.value.split(' ')
} else if (a.name == 'split') {
- config[a.name] = a.value.trim().split(' ')
+ config[a.name] = a.value.split(' ')
} else if (['in', 'out'].indexOf(a.name) > -1) {
config[a.name] = parseTime(a.value)
} else {