diff --git a/source/Ox.UI/js/Core/Ox.JQueryElement.js b/source/Ox.UI/js/Core/Ox.JQueryElement.js index 05a40499..3bd141c5 100644 --- a/source/Ox.UI/js/Core/Ox.JQueryElement.js +++ b/source/Ox.UI/js/Core/Ox.JQueryElement.js @@ -27,7 +27,6 @@ Ox.forEach($('
'), function(val, key) { if (Ox.isFunction(val)) { Ox.JQueryElement.prototype[key] = function() { var args = arguments, id, ret, that = this; - if (key == 'size') Ox.print('size', args) Ox.forEach(args, function(arg, i) { // if an ox object was passed // then pass its $element instead diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js index d9f787fd..b877efda 100644 --- a/source/Ox.UI/js/Video/Ox.VideoEditor.js +++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js @@ -136,8 +136,9 @@ Ox.VideoEditor = function(options, self) { self.$editor = new Ox.Element() .addClass('OxVideoEditor') - .click(function() { - that.gainFocus() + .click(function(e) { + var $target = $(e.target); + !$target.is('.OxPosition') && !$target.is('input') && that.gainFocus(); }); self.sizes = getSizes(); diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js index c986d5f6..26431469 100644 --- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js @@ -405,14 +405,6 @@ Ox.VideoPlayer = function(options, self) { src: Ox.UI.PATH + 'png/videoMarker' + titleCase + '.png' }) .appendTo(self.$videoContainer); - // fixme: there's a bug in jquery and/or webkit - // normally, setMarker() should properly .show() - // the in markers of the in player - // or the out markers of the out player, - // but only setting css display seems to work - if (self.options.type == point) { - self.$pointMarker[point][edge].css({display: 'block'}); - } }); }); @@ -1397,7 +1389,7 @@ Ox.VideoPlayer = function(options, self) { self.$video .one({ load: function() { - Ox.print('IMAGE LOADED', self.options.video(self.options.position)) + Ox.print('IMAGE LOADED', self.options.video(self.options.position, self.options.width)) hideLoadingIcon(); } }) @@ -1492,9 +1484,6 @@ Ox.VideoPlayer = function(options, self) { } else { setPosition(self.options.position, 'video'); } - that.triggerEvent('position', { - position: self.options.position - }); } function playInToOut() { @@ -1550,8 +1539,10 @@ Ox.VideoPlayer = function(options, self) { Ox.forEach(self.$pointMarker, function(markers, point) { Ox.forEach(markers, function(marker) { //Ox.print(self.options.position, self.options[point], isEqual(self.options.position, self.options[point])) + // fixme: there's a bug in jquery and/or webkit + // on load, show() doesn't work isEqual(self.options.position, self.options[point]) ? - marker.show() : marker.hide(); + marker.css({display: 'block'}) : marker.hide(); }); }); } @@ -1591,6 +1582,9 @@ Ox.VideoPlayer = function(options, self) { //showLoadingIcon(); loadImage(); } + that.triggerEvent('position', { + position: self.options.position + }); } function setResolution() {