0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

events are lowercase, VideoPanel defaults

Browse source
This commit is contained in:
j 2012-02-01 07:17:47 +00:00
parent 9b2766bc17
commit 02e53ed3e0
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/Ox.UI/js/Video/Ox.VideoEditor.js
View file

@ -442,14 +442,14 @@ Ox.VideoEditor = function(options, self) {
width: 256 width: 256
}).open(); }).open();
} else if (id == 'downloadVideo') { } else if (id == 'downloadVideo') {
that.triggerEvent('downloadVideo'); that.triggerEvent('downloadvideo');
} else if (id == 'downloadSelection') { } else if (id == 'downloadSelection') {
that.triggerEvent('downloadSelection', { that.triggerEvent('downloadselection', {
'in': self.options['in'], 'in': self.options['in'],
out: self.options.out, out: self.options.out,
}); });
} else if (id == 'embedSelection') { } else if (id == 'embedSelection') {
that.triggerEvent('embedSelection', { that.triggerEvent('embedselection', {
'in': self.options['in'], 'in': self.options['in'],
out: self.options.out, out: self.options.out,
}); });

6
source/Ox.UI/js/Video/Ox.VideoPanel.js
View file

@ -16,7 +16,9 @@ Ox.VideoPanel = function(options, self) {
self = self || {}; self = self || {};
var that = Ox.Element({}, self) var that = Ox.Element({}, self)
.defaults({ .defaults({
annotationsCalendarSize: 256,
annotationsFont: 'small', annotationsFont: 'small',
annotationsMapSize: 256,
annotationsRange: 'all', annotationsRange: 'all',
annotationsSize: 256, annotationsSize: 256,
annotationsSort: 'position', annotationsSort: 'position',
@ -40,6 +42,8 @@ Ox.VideoPanel = function(options, self) {
resolution: 0, resolution: 0,
scaleToFill: false, scaleToFill: false,
showAnnotations: false, showAnnotations: false,
showAnnotationsCalendar: false,
showAnnotationsMap: false,
showLayers: {}, showLayers: {},
showTimeline: true, showTimeline: true,
showUsers: false, showUsers: false,
@ -98,6 +102,7 @@ Ox.VideoPanel = function(options, self) {
.bindEvent({ .bindEvent({
find: function(data) { find: function(data) {
self.$timeline.options({find: data.find}); self.$timeline.options({find: data.find});
self.$annotationPanel.options({highlight: data.find});
that.triggerEvent('find', data); that.triggerEvent('find', data);
}, },
fullscreen: function(data) { fullscreen: function(data) {
@ -172,6 +177,7 @@ Ox.VideoPanel = function(options, self) {
clickLink: self.options.clickLink, clickLink: self.options.clickLink,
editable: false, editable: false,
font: self.options.annotationsFont, font: self.options.annotationsFont,
highlight: self.options.find,
'in': self.options['in'], 'in': self.options['in'],
layers: self.options.layers, layers: self.options.layers,
mapSize: self.options.annotationsMapSize, mapSize: self.options.annotationsMapSize,