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

make video editor handle internal links (fixes #494)

Browse source
This commit is contained in:
rlx 2012-02-17 16:13:08 +00:00
commit e8f370ab7c
5 changed files with 38 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,7 @@ Ox.VideoPanel = function(options, self) {
poster: '',
resolution: 0,
scaleToFill: false,
selected: '',
showAnnotations: false,
showAnnotationsCalendar: false,
showAnnotationsMap: false,
@ -366,16 +367,14 @@ Ox.VideoPanel = function(options, self) {
self.$video.options({
height: getPlayerHeight()
});
} else if (key == 'in' || key == 'out') {
setPoint(key, value);
} else if (key == 'position') {
self.$video.options({
position: value
});
self.$timeline.options({
position: value
});
self.$annotationPanel.options({
position: value
});
self.$video.options({position: value});
self.$timeline.options({position: value});
self.$annotationPanel.options({position: value});
} else if (key == 'selected') {
self.$annotationPanel.options({selected: value});
} else if (key == 'showAnnotations') {
that.$element.toggle(1);
} else if (key == 'showTimeline') {