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

merge

Browse source
This commit is contained in:
rolux 2012-01-02 19:36:19 +05:30
commit be06c433d1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/Ox.UI/js/Video/Ox.VideoPlayer.js
View file

@ -1956,7 +1956,7 @@ Ox.VideoPlayer = function(options, self) {
setSize(self.$spaceTop, getCSS('spaceTop'), animate); setSize(self.$spaceTop, getCSS('spaceTop'), animate);
setSize(self.$controlsBottom, getCSS('controlsBottom'), animate); setSize(self.$controlsBottom, getCSS('controlsBottom'), animate);
setSize(self.$timeline, getCSS('timeline'), animate, function() { setSize(self.$timeline, getCSS('timeline'), animate, function() {
self.$timeline.options({ self.$timeline && self.$timeline.options({
width: self.timelineWidth width: self.timelineWidth
}); });
}); });
@ -2326,7 +2326,7 @@ Ox.VideoPlayer = function(options, self) {
setSizes(); setSizes();
} else if (key == 'in' || key == 'out') { } else if (key == 'in' || key == 'out') {
self.options.paused && setMarkers(); self.options.paused && setMarkers();
self.$timeline.options(key, value); self.$timeline && self.$timeline.options(key, value);
} else if (key == 'muted') { } else if (key == 'muted') {
toggleMuted(); toggleMuted();
} else if (key == 'paused') { } else if (key == 'paused') {