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

dont select results if opening video at position, fixes #1900

Browse source
This commit is contained in:
j 2014-02-18 07:52:21 +00:00
parent 36307a6060
commit f3cf407d0b
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
static/js/UI.js
View file

@ -147,6 +147,12 @@ pandora.UI = (function() {
// add default video points // add default video points
add['videoPoints.' + item] = {annotation: '', 'in': 0, out: 0, position: 0}; 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) { if (['timeline', 'player', 'editor'].indexOf(args.itemView) > -1) {

2
static/js/editor.js
View file

@ -52,6 +52,7 @@ pandora.ui.editor = function(data) {
selected: ui.videoPoints[ui.item].annotation selected: ui.videoPoints[ui.item].annotation
? ui.item + '/' + ui.videoPoints[ui.item].annotation ? ui.item + '/' + ui.videoPoints[ui.item].annotation
: '', : '',
selectResult: !pandora._dontSelectResult,
showAnnotations: ui.showAnnotations, showAnnotations: ui.showAnnotations,
showAnnotationsCalendar: ui.showAnnotationsCalendar, showAnnotationsCalendar: ui.showAnnotationsCalendar,
showAnnotationsMap: ui.showAnnotationsMap, showAnnotationsMap: ui.showAnnotationsMap,
@ -288,6 +289,7 @@ pandora.ui.editor = function(data) {
that.options({timeline: data.value}); that.options({timeline: data.value});
} }
}); });
pandora._dontSelectResult = false;
function updateBrowser() { function updateBrowser() {
pandora.$ui.browser.find('img[src*="/' + ui.item + '/"]').each(function() { pandora.$ui.browser.find('img[src*="/' + ui.item + '/"]').each(function() {