decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

fix #2559 (extra history entry added when resolving annotation id breaks back button)

Browse source
This commit is contained in:
rolux 2014-11-15 14:13:42 +00:00
parent 1b9df27136
commit 1e3fa3c98e
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
static/js/utils.js
View file

@ -1686,12 +1686,15 @@ pandora.getSpan = function(state, val, callback) {
if (result.data.items.length) { if (result.data.items.length) {
span = result.data.items[0]; span = result.data.items[0];
annotation = span.id.split('/')[1]; annotation = span.id.split('/')[1];
type == 'annotation' && pandora.UI.set('videoPoints.' + state.item, { // This is an optimization to make sure the video view
annotation: annotation, // immediately loads at the correct position
'in': span['in'], if (type == 'annotation') {
out: span.out, pandora.user.ui.videoPoints[state.item] = {
position: span['in'] 'in': span['in'],
}); out: span.out,
position: span['in']
};
}
} }
callback( callback(
!span ? '' !span ? ''