sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

move import/export annotations to menu in annotations panel

Browse source
This commit is contained in:
rlx 2014-09-18 14:27:27 +02:00
commit 916c194301
2 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
source/Ox.UI/js/Video/VideoAnnotationPanel.js
View file

@ -637,9 +637,6 @@ Ox.VideoAnnotationPanel = function(options, self) {
{id: 'embedSelection', title: Ox._('Embed Selection...')},
{id: 'linkToSelection', title: Ox._('Link to Selection...')},
{},
{id: 'importAnnotations', title: Ox._('Import Annotations...'), disabled: !self.options.enableImport},
{id: 'exportAnnotations', title: Ox._('Export Annotations...'), disabled: !self.options.enableExport},
{},
{id: 'keyboard', title: Ox._('Keyboard Shortcuts...'), keyboard: 'h'}
]
),
@ -679,10 +676,6 @@ Ox.VideoAnnotationPanel = function(options, self) {
'in': self.options['in'],
out: self.options.out
});
} else if (id == 'importAnnotations') {
that.triggerEvent('importannotations');
} else if (id == 'exportAnnotations') {
that.triggerEvent('exportannotations');
} else if (id == 'keyboard') {
showKeyboardShortcuts();
}
@ -802,6 +795,8 @@ Ox.VideoAnnotationPanel = function(options, self) {
calendarSize: self.options.annotationsCalendarSize,
clickLink: self.options.clickLink,
editable: true,
enableExport: self.options.enableExport,
enableImport: self.options.enableImport,
highlight: self.options.find,
'in': self.options['in'],
itemName: self.options.itemName,
@ -855,6 +850,9 @@ Ox.VideoAnnotationPanel = function(options, self) {
self.editing = true;
setTimelineState();
},
exportannotations: function() {
that.triggerEvent('exportannotations');
},
find: function(data) {
self.$findInput.options({value: data.value});
submitFindInput(data.value, true);
@ -863,6 +861,9 @@ Ox.VideoAnnotationPanel = function(options, self) {
that.triggerEvent('findannotations', data);
},
focus: that.gainFocus,
importannotations: function() {
that.triggerEvent('importannotations');
},
info: function(data) {
that.triggerEvent('info', data);
},