forked from 0x2620/pandora
dont trigger videopointsEvent on inactive elements, fixes #2324
This commit is contained in:
parent
24ead6ffd3
commit
1bde96af3c
2 changed files with 4 additions and 5 deletions
|
@ -114,15 +114,14 @@ pandora.ui.info = function() {
|
|||
})
|
||||
.bindEvent({
|
||||
click: function(data) {
|
||||
pandora.UI.set(
|
||||
'videoPoints.' + id + '.position',
|
||||
data.position
|
||||
);
|
||||
if (ui.item && ['timeline', 'player', 'editor'].indexOf(ui.itemView) > -1) {
|
||||
pandora.$ui[ui.itemView].options({
|
||||
position: data.position
|
||||
});
|
||||
} else {
|
||||
pandora.UI.set('videoPoints.' + id, {
|
||||
'in': 0, out: 0, position: data.position
|
||||
});
|
||||
pandora.UI.set({
|
||||
item: id,
|
||||
itemView: ui.videoView
|
||||
|
|
|
@ -140,7 +140,7 @@ pandora.ui.item = function() {
|
|||
videopointsEvent,
|
||||
function(data, event, element) {
|
||||
var options = {};
|
||||
if (event == videopointsEvent) {
|
||||
if (pandora.user.ui.item && event == videopointsEvent) {
|
||||
//Ox.print('DATA.VALUE', JSON.stringify(data.value));
|
||||
if (data && data.value && data.value.annotation) {
|
||||
options.selected = pandora.user.ui.item + '/' + data.value.annotation;
|
||||
|
|
Loading…
Reference in a new issue