merging changes

This commit is contained in:
rlx 2011-02-26 04:25:45 +00:00
commit 7cbbab915a

View file

@ -11970,7 +11970,7 @@ requires
.mousemove(function(event) { .mousemove(function(event) {
var position = getPosition(event), var position = getPosition(event),
image = getFrame(position), image = getFrame(position),
frameHeight = image.height; frameHeight = image?image.height:that.height();
frame.attr('src', image.src); frame.attr('src', image.src);
timestamp.html(Ox.formatDuration(position, 'short')); timestamp.html(Ox.formatDuration(position, 'short'));