From 02e53ed3e069286a88742824edac0af2c40d63e6 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Wed, 1 Feb 2012 07:17:47 +0000 Subject: [PATCH] events are lowercase, VideoPanel defaults --- source/Ox.UI/js/Video/Ox.VideoEditor.js | 6 +++--- source/Ox.UI/js/Video/Ox.VideoPanel.js | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js index 2c3a6105..0a4f02a5 100644 --- a/source/Ox.UI/js/Video/Ox.VideoEditor.js +++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js @@ -442,14 +442,14 @@ Ox.VideoEditor = function(options, self) { width: 256 }).open(); } else if (id == 'downloadVideo') { - that.triggerEvent('downloadVideo'); + that.triggerEvent('downloadvideo'); } else if (id == 'downloadSelection') { - that.triggerEvent('downloadSelection', { + that.triggerEvent('downloadselection', { 'in': self.options['in'], out: self.options.out, }); } else if (id == 'embedSelection') { - that.triggerEvent('embedSelection', { + that.triggerEvent('embedselection', { 'in': self.options['in'], out: self.options.out, }); diff --git a/source/Ox.UI/js/Video/Ox.VideoPanel.js b/source/Ox.UI/js/Video/Ox.VideoPanel.js index 3da086e8..3af856ec 100644 --- a/source/Ox.UI/js/Video/Ox.VideoPanel.js +++ b/source/Ox.UI/js/Video/Ox.VideoPanel.js @@ -16,7 +16,9 @@ Ox.VideoPanel = function(options, self) { self = self || {}; var that = Ox.Element({}, self) .defaults({ + annotationsCalendarSize: 256, annotationsFont: 'small', + annotationsMapSize: 256, annotationsRange: 'all', annotationsSize: 256, annotationsSort: 'position', @@ -40,6 +42,8 @@ Ox.VideoPanel = function(options, self) { resolution: 0, scaleToFill: false, showAnnotations: false, + showAnnotationsCalendar: false, + showAnnotationsMap: false, showLayers: {}, showTimeline: true, showUsers: false, @@ -98,6 +102,7 @@ Ox.VideoPanel = function(options, self) { .bindEvent({ find: function(data) { self.$timeline.options({find: data.find}); + self.$annotationPanel.options({highlight: data.find}); that.triggerEvent('find', data); }, fullscreen: function(data) { @@ -172,6 +177,7 @@ Ox.VideoPanel = function(options, self) { clickLink: self.options.clickLink, editable: false, font: self.options.annotationsFont, + highlight: self.options.find, 'in': self.options['in'], layers: self.options.layers, mapSize: self.options.annotationsMapSize,