merge
This commit is contained in:
commit
9c34b74621
1 changed files with 10 additions and 9 deletions
|
@ -10318,15 +10318,16 @@ requires
|
|||
if (self.options.type == 'play') {
|
||||
self.video.currentTime = self.options.position;
|
||||
} else {
|
||||
self.$loadingIcon && self.$loadingIcon.stop();
|
||||
if (self.$video.attr('src') != self.options.url(self.options.position)) {
|
||||
self.$loadingIcon = new Ox.LoadingIcon()
|
||||
.appendTo(that)
|
||||
.start();
|
||||
self.$video.attr({
|
||||
src: self.options.url(self.options.position)
|
||||
})
|
||||
.one('load', function() {
|
||||
self.$loadingIcon.stop();
|
||||
});
|
||||
.load(self.$loadingIcon.stop);
|
||||
}
|
||||
}
|
||||
setMarkers();
|
||||
setSubtitle();
|
||||
|
|
Loading…
Reference in a new issue