CAMP/oxjstmp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
This commit is contained in:
j 2010-11-28 17:26:27 +01:00
commit af8244a173
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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 && self.$loadingIcon.stop();
if (self.$video.attr('src') != self.options.url(self.options.position)) {
self.$loadingIcon = new Ox.LoadingIcon() self.$loadingIcon = new Ox.LoadingIcon()
.appendTo(that) .appendTo(that)
.start(); .start();
self.$video.attr({ self.$video.attr({
src: self.options.url(self.options.position) src: self.options.url(self.options.position)
}) })
.one('load', function() { .load(self.$loadingIcon.stop);
self.$loadingIcon.stop(); }
});
} }
setMarkers(); setMarkers();
setSubtitle(); setSubtitle();