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

minor changes

Browse source
This commit is contained in:
rlx 2011-08-24 21:05:39 +00:00
parent 297ac0a141
commit 9ea5cce853
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -318,8 +318,8 @@ Ox.load.UI = function(options, callback) {
}, 1000, function() { }, 1000, function() {
if (error) { if (error) {
$div.click(function() { $div.click(function() {
$div.remove(); $div.remove();
}); });
} else { } else {
clearInterval(loadingInterval); clearInterval(loadingInterval);
$div.remove(); $div.remove();

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

@ -255,7 +255,7 @@ Ox.VideoPlayer = function(options, self) {
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
*/ */
self.$videoContainer = $('<div>') self.$videoContainer = Ox.Element()
.addClass('OxVideoContainer') .addClass('OxVideoContainer')
.css({ .css({
top: self.options.externalControls && self.options.controlsTop.length ? '16px' : 0, top: self.options.externalControls && self.options.controlsTop.length ? '16px' : 0,
@ -264,12 +264,13 @@ Ox.VideoPlayer = function(options, self) {
if (self.options.type == 'play') { if (self.options.type == 'play') {
self.options.enableMouse && self.$videoContainer.bind({ self.options.enableMouse && self.$videoContainer.bindEvent({
click: function(e) { anyclick: function(e) {
if (!$(e.target).is('.OxLogo')) { if (!$(e.target).is('.OxLogo')) {
togglePaused(); togglePaused();
} }
} }
// fixme: support drag (left-right)
}); });
self.$video = Ox.VideoElement( self.$video = Ox.VideoElement(