From 0ceaf11ea2f18ccf2ae7b5b70e38ec47fbf661e9 Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Sun, 2 Feb 2014 19:09:05 +0000
Subject: [PATCH] load small timeline images synchronously, fails on 0xdb
---
.../Ox.UI/js/Video/SmallVideoTimelineImage.js | 21 ++++++++-----------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/source/Ox.UI/js/Video/SmallVideoTimelineImage.js b/source/Ox.UI/js/Video/SmallVideoTimelineImage.js
index b74839bb..767404e0 100644
--- a/source/Ox.UI/js/Video/SmallVideoTimelineImage.js
+++ b/source/Ox.UI/js/Video/SmallVideoTimelineImage.js
@@ -138,6 +138,9 @@ Ox.SmallVideoTimelineImage = function(options, self) {
}
self.$subtitles = $('')
+ .attr({
+ src: getImageURL('subtitles')
+ })
.css({
position: 'absolute',
top: self.imageTop + 'px',
@@ -147,6 +150,9 @@ Ox.SmallVideoTimelineImage = function(options, self) {
.appendTo(that);
self.$results = $('')
+ .attr({
+ src: getImageURL('results')
+ })
.css({
position: 'absolute',
top: self.imageTop + 'px',
@@ -156,6 +162,9 @@ Ox.SmallVideoTimelineImage = function(options, self) {
.appendTo(that);
self.$selection = $('')
+ .attr({
+ src: getImageURL('selection')
+ })
.css({
position: 'absolute',
top: self.imageTop + 'px',
@@ -164,18 +173,6 @@ Ox.SmallVideoTimelineImage = function(options, self) {
})
.appendTo(that);
- setTimeout(function() {
- self.$subtitles.attr({
- src: getImageURL('subtitles')
- });
- self.$results.attr({
- src: getImageURL('results')
- });
- self.$selection.attr({
- src: getImageURL('selection')
- });
- });
-
function getClipTimeline() {
var $canvas, context, image,
firstTile, lastTile, tileHeight, tileOffset, tileWidth;