0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

newlines in srt are explicit, fixes #634

Browse source
This commit is contained in:
j 2012-03-03 10:53:12 +01:00
commit 159b6dc746
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
static/js/pandora/importAnnotations.js
View file

@ -60,7 +60,10 @@ pandora.ui.importAnnotations = function(data) {
function addAnnotation() {
if(srt.length>0) {
var data = srt.shift();
data.text = Ox.parseHTML(data.text);
data.text = Ox.parseHTML(data.text)
.replace(/<br[ /]*?>\n/g, '\n')
.replace(/\n\n/g, '<br>\n')
.replace(/\n/g, '<br>\n');
$status.html(Ox.formatDuration(data['in'])
+ ' to ' + Ox.formatDuration(data.out) + '<br>\n'
+ data.text);