forked from 0x2620/pandora
dont select results if opening video at position, fixes #1900
This commit is contained in:
parent
36307a6060
commit
f3cf407d0b
2 changed files with 8 additions and 0 deletions
|
@ -147,6 +147,12 @@ pandora.UI = (function() {
|
|||
// add default video points
|
||||
add['videoPoints.' + item] = {annotation: '', 'in': 0, out: 0, position: 0};
|
||||
}
|
||||
if (
|
||||
args['videoPoints.' + item]
|
||||
&& (!pandora.user.ui.item || pandora.user.ui.itemView != 'editor')
|
||||
) {
|
||||
pandora._dontSelectResult = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (['timeline', 'player', 'editor'].indexOf(args.itemView) > -1) {
|
||||
|
|
|
@ -52,6 +52,7 @@ pandora.ui.editor = function(data) {
|
|||
selected: ui.videoPoints[ui.item].annotation
|
||||
? ui.item + '/' + ui.videoPoints[ui.item].annotation
|
||||
: '',
|
||||
selectResult: !pandora._dontSelectResult,
|
||||
showAnnotations: ui.showAnnotations,
|
||||
showAnnotationsCalendar: ui.showAnnotationsCalendar,
|
||||
showAnnotationsMap: ui.showAnnotationsMap,
|
||||
|
@ -288,6 +289,7 @@ pandora.ui.editor = function(data) {
|
|||
that.options({timeline: data.value});
|
||||
}
|
||||
});
|
||||
pandora._dontSelectResult = false;
|
||||
|
||||
function updateBrowser() {
|
||||
pandora.$ui.browser.find('img[src*="/' + ui.item + '/"]').each(function() {
|
||||
|
|
Loading…
Reference in a new issue