From bfac98643dc732f1e114f96bf0ba1b8fe85410f5 Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Wed, 2 Nov 2011 20:51:54 +0000 Subject: [PATCH] pass fullscreen option down to and up from video player --- source/Ox.UI/js/Video/Ox.VideoElement.js | 1 + source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js | 11 ++++++++++- source/Ox.UI/js/Video/Ox.VideoPlayer.js | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/source/Ox.UI/js/Video/Ox.VideoElement.js b/source/Ox.UI/js/Video/Ox.VideoElement.js index 2df4af19..404b0250 100644 --- a/source/Ox.UI/js/Video/Ox.VideoElement.js +++ b/source/Ox.UI/js/Video/Ox.VideoElement.js @@ -243,6 +243,7 @@ Ox.VideoElement = function(options, self) { self.video.pause(); self.video.currentTime = 0; } + Ox.print('?????', self.items[self.currentItem].$videos) self.$video = self.items[self.currentItem].$videos[part].css(css).show(); self.video = self.$video[0]; !self.paused && self.video.play(); diff --git a/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js index 7911c94d..8348784d 100644 --- a/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoPanelPlayer.js @@ -18,6 +18,7 @@ Ox.VideoPanelPlayer = function(options, self) { censored: [], duration: 0, find: '', + fullscreen: false, height: 0, 'in': 0, loop: false, @@ -74,6 +75,7 @@ Ox.VideoPanelPlayer = function(options, self) { enableKeyboard: true, enableMouse: true, find: self.options.find, + fullscreen: self.options.fullscreen, height: getPlayerHeight(), 'in': self.options['in'], muted: self.options.muted, @@ -92,6 +94,9 @@ Ox.VideoPanelPlayer = function(options, self) { self.$timeline.options({find: data.find}); that.triggerEvent('find', data); }, + fullscreen: function(data) { + self.options.fullscreen = data.fullscreen; + }, position: setPosition, muted: function(data) { that.triggerEvent('muted', data); @@ -257,7 +262,11 @@ Ox.VideoPanelPlayer = function(options, self) { } self.setOption = function(key, value) { - if (key == 'height') { + if (key == 'fullscreen') { + self.$video.options({ + fullscreen: value + }); + } else if (key == 'height') { self.$video.options({ height: getPlayerHeight() }); diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js index e4f04082..ab4242f3 100644 --- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js @@ -2089,6 +2089,9 @@ Ox.VideoPlayer = function(options, self) { if (self.$fullscreenButton && from != 'button') { self.$fullscreenButton.toggleTitle(); } + that.triggerEvent('fullscreen', { + fullscreen: self.options.fullscreen + }); } function toggleMuted(from) {