0x2620/njpma
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: 0x2620:f39f8548215d4c01028f9de5ec7286b9e801a7c0
Branches Tags
0x2620:main
..
compare: 0x2620:4cd85603127574836eef93400d0f846d0e2f733e
Branches Tags
0x2620:main

3 commits
f39f854821 ... 4cd8560312

Author SHA1 Message Date
j
4cd8560312 revert annotation max height calculation 2022-09-26 22:08:29 +01:00
j
405cb1029d fix italic urls 2022-09-26 22:04:10 +01:00
j
0746a2ab6c update height on display 2022-09-26 22:04:10 +01:00
2 changed files with 7 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/static/css/partials/_text.scss
View file

@ -39,15 +39,15 @@
} }
@font-face { @font-face {
font-family: 'noto_sans'; font-family: 'noto_sans';
src: url('noto-sans-bold-italic-webfont.woff2') format('woff2'), src: url('../../static/fonts/noto-sans/noto-sans-bold-italic-webfont.woff2') format('woff2'),
url('noto-sans-bold-italic-webfont.woff') format('woff'); url('../../static/fonts/noto-sans/noto-sans-bold-italic-webfont.woff') format('woff');
font-weight: 700; font-weight: 700;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: 'noto_sans'; font-family: 'noto_sans';
src: url('noto-sans-bold-italic-webfont.woff2') format('woff2'), src: url('../../static/fonts/noto-sans/noto-sans-bold-italic-webfont.woff2') format('woff2'),
url('noto-sans-bold-italic-webfont.woff') format('woff'); url('../../static/fonts/noto-sans/noto-sans-bold-italic-webfont.woff') format('woff');
font-weight: 700; font-weight: 700;
font-style: bold italic; font-style: bold italic;
} }

30
app/static/js/ascroll.js
View file

@ -71,17 +71,9 @@ function timeupdate(event) {
var ain = parseFloat(annot.dataset.in) var ain = parseFloat(annot.dataset.in)
var aout = parseFloat(annot.dataset.out) var aout = parseFloat(annot.dataset.out)
if (ain <= currentTime && aout > currentTime) { if (ain <= currentTime && aout > currentTime) {
if (annot.classList.contains('single')) { annot.style.display = ''
annot.style.opacity = '1'
} else {
annot.style.display = ''
}
} else { } else {
if (annot.classList.contains('single')) { annot.style.display = 'none'
annot.style.opacity = '0'
} else {
annot.style.display = 'none'
}
} }
}) })
@ -417,7 +409,6 @@ function renderSingleMode(config) {
config.root.appendChild(div) config.root.appendChild(div)
var frame = div.querySelector('.frame') var frame = div.querySelector('.frame')
var text = div.querySelector('.text') var text = div.querySelector('.text')
text.style.position = 'relative'
var first = config.annotations[0] var first = config.annotations[0]
if (text && first) { if (text && first) {
var color1 = `hsl(${first.color1.hue}, 60%, 15%)` var color1 = `hsl(${first.color1.hue}, 60%, 15%)`
@ -436,28 +427,13 @@ function renderSingleMode(config) {
values = values.join('<br><br>') values = values.join('<br><br>')
var annot = document.createElement('div') var annot = document.createElement('div')
annot.classList.add('annotation') annot.classList.add('annotation')
annot.classList.add('single')
annot.innerHTML = values annot.innerHTML = values
//console.log(clip) //console.log(clip)
annot.dataset['in'] = clip.annotations[0]['in'] annot.dataset['in'] = clip.annotations[0]['in']
annot.dataset['out'] = clip.annotations[0]['out'] annot.dataset['out'] = clip.annotations[0]['out']
annot.style.opacity = '0' annot.style.display = 'none'
annot.style.position = 'absolute'
text.appendChild(annot) 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) { if (frame) {
updatePlayer(config.video, frame, config['in'], config['out'], src, config) updatePlayer(config.video, frame, config['in'], config['out'], src, config)
} }