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

handle negative video selection span passed in url

Browse source
This commit is contained in:
rolux 2011-11-03 01:09:59 +00:00
parent 2748ab6978
commit 6bb51eabdb
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
static/js/pandora/URL.js
View file

@ -185,7 +185,7 @@ pandora.URL = (function() {
set['videoPoints.' + state.item] = { set['videoPoints.' + state.item] = {
position: state.span[0], position: state.span[0],
'in': state.span[1] || 0, 'in': state.span[1] || 0,
out: state.span[2] || 0 out: Math.max(state.span[1] || 0, state.span[2] || 0)
} }
} else if (state.view == 'map') { } else if (state.view == 'map') {
// fixme: this doesn't handle map coordinates // fixme: this doesn't handle map coordinates

4
static/js/pandora/logsDialog.js
View file

@ -87,9 +87,7 @@ pandora.ui.logsDialog = function() {
id: 'text', id: 'text',
title: 'Text', title: 'Text',
tooltip: function(data) { tooltip: function(data) {
return $('<code>').append( return $('<code>').append($('<pre>').append(data.text));
$('<pre>').html(data.text.replace(/\n\n/g, '<br/>'))
);
}, },
visible: true, visible: true,
width: 640 width: 640