From 9408a5f986437e06a4a84337d87c902bfc155f2a Mon Sep 17 00:00:00 2001 From: rolux Date: Thu, 18 Sep 2014 14:16:38 +0200 Subject: [PATCH] pass item duration to import annotations dialog --- static/js/editor.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/static/js/editor.js b/static/js/editor.js index 38652e99c..a8e7fe9af 100644 --- a/static/js/editor.js +++ b/static/js/editor.js @@ -3,6 +3,7 @@ 'use strict'; pandora.ui.editor = function(data) { + var ui = pandora.user.ui, that = Ox.VideoAnnotationPanel({ @@ -170,7 +171,7 @@ pandora.ui.editor = function(data) { pandora.$ui.embedVideoDialog = pandora.ui.embedVideoDialog().open(); }, exportannotations: function() { - // ... + pandora.$ui.exportAnnotationsDialog = pandora.ui.exportAnnotationsDialog().open(); }, find: function(data) { pandora.UI.set({itemFind: data.find}); @@ -188,8 +189,8 @@ pandora.ui.editor = function(data) { gainfocus: function() { pandora.$ui.mainMenu.replaceItemMenu(); }, - importannotations: function(data) { - pandora.ui.importAnnotationsDialog().open(); + importannotations: function() { + pandora.$ui.importAnnotationsDialog = pandora.ui.importAnnotationsDialog(data.duration).open(); }, info: function(data) { pandora.ui.annotationDialog( @@ -303,6 +304,7 @@ pandora.ui.editor = function(data) { that.options({timeline: data.value}); } }); + pandora._dontSelectResult = false; function updateBrowser() {