0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

merge

Browse source
This commit is contained in:
j 2010-11-28 17:26:27 +01:00
commit 9c34b74621
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
build/js/ox.ui.js
View file

@ -10318,15 +10318,16 @@ requires
if (self.options.type == 'play') { if (self.options.type == 'play') {
self.video.currentTime = self.options.position; self.video.currentTime = self.options.position;
} else { } else {
self.$loadingIcon = new Ox.LoadingIcon() self.$loadingIcon && self.$loadingIcon.stop();
.appendTo(that) if (self.$video.attr('src') != self.options.url(self.options.position)) {
.start(); self.$loadingIcon = new Ox.LoadingIcon()
self.$video.attr({ .appendTo(that)
src: self.options.url(self.options.position) .start();
}) self.$video.attr({
.one('load', function() { src: self.options.url(self.options.position)
self.$loadingIcon.stop(); })
}); .load(self.$loadingIcon.stop);
}
} }
setMarkers(); setMarkers();
setSubtitle(); setSubtitle();