merging changes

This commit is contained in:
rlx 2011-08-21 08:18:38 +00:00
parent cb1024a1f7
commit e3d9969c93

View file

@ -36,6 +36,7 @@ Ox.VideoPreview = function(options, self) {
self.$interface = Ox.Element({
tooltip: function(event) {
//event.offsetX does not work in Firefox
// fixme: use layerX then
var position = getPosition(event.clientX - that.offset().left);
self.$frame.attr({src: self.options.getFrame(position)});
return Ox.formatDuration(position, 2);