load small timeline images synchronously, fails on 0xdb

This commit is contained in:
j 2014-02-02 19:09:05 +00:00
parent be9ec5a86a
commit 0ceaf11ea2

View file

@ -138,6 +138,9 @@ Ox.SmallVideoTimelineImage = function(options, self) {
} }
self.$subtitles = $('<img>') self.$subtitles = $('<img>')
.attr({
src: getImageURL('subtitles')
})
.css({ .css({
position: 'absolute', position: 'absolute',
top: self.imageTop + 'px', top: self.imageTop + 'px',
@ -147,6 +150,9 @@ Ox.SmallVideoTimelineImage = function(options, self) {
.appendTo(that); .appendTo(that);
self.$results = $('<img>') self.$results = $('<img>')
.attr({
src: getImageURL('results')
})
.css({ .css({
position: 'absolute', position: 'absolute',
top: self.imageTop + 'px', top: self.imageTop + 'px',
@ -156,6 +162,9 @@ Ox.SmallVideoTimelineImage = function(options, self) {
.appendTo(that); .appendTo(that);
self.$selection = $('<img>') self.$selection = $('<img>')
.attr({
src: getImageURL('selection')
})
.css({ .css({
position: 'absolute', position: 'absolute',
top: self.imageTop + 'px', top: self.imageTop + 'px',
@ -164,18 +173,6 @@ Ox.SmallVideoTimelineImage = function(options, self) {
}) })
.appendTo(that); .appendTo(that);
setTimeout(function() {
self.$subtitles.attr({
src: getImageURL('subtitles')
});
self.$results.attr({
src: getImageURL('results')
});
self.$selection.attr({
src: getImageURL('selection')
});
});
function getClipTimeline() { function getClipTimeline() {
var $canvas, context, image, var $canvas, context, image,
firstTile, lastTile, tileHeight, tileOffset, tileWidth; firstTile, lastTile, tileHeight, tileOffset, tileWidth;