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

in Ox.VideoPanel, use setElement(...), not that. = ...

Browse source
This commit is contained in:
rlx 2012-04-17 07:51:32 +00:00
parent 79fb1fb968
commit c6f0308a17
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -262,7 +262,8 @@ Ox.VideoPanel = function(options, self) {
}); });
}); });
that.$element = Ox.SplitPanel({ that.setElement(
Ox.SplitPanel({
elements: [ elements: [
{ {
element: self.$videoPanel element: self.$videoPanel
@ -278,7 +279,8 @@ Ox.VideoPanel = function(options, self) {
} }
], ],
orientation: 'horizontal' orientation: 'horizontal'
}); })
);
function changeTimeline(data) { function changeTimeline(data) {
self.options.position = data.position; self.options.position = data.position;
@ -308,8 +310,8 @@ Ox.VideoPanel = function(options, self) {
function getTimelineWidth() { function getTimelineWidth() {
return self.options.width - return self.options.width -
(self.options.showAnnotations && !self.fullscreen) * (self.options.showAnnotations && !self.fullscreen)
self.options.annotationsSize - 16 - 1; * self.options.annotationsSize - 16 - 1;
} }
function resizeAnnotations(data) { function resizeAnnotations(data) {