diff --git a/source/Ox.UI/js/Video/VideoPlayer.js b/source/Ox.UI/js/Video/VideoPlayer.js index 08bc3e28..0b0daaa3 100644 --- a/source/Ox.UI/js/Video/VideoPlayer.js +++ b/source/Ox.UI/js/Video/VideoPlayer.js @@ -194,7 +194,7 @@ Ox.VideoPlayer = function(options, self) { }, out: function() { self.options.paused && setMarkers(); - self.$timeline && self.$timeline.options('out', self.options.out); + self.$timeline && self.$timeline.options({out: self.options.out}); }, muted: function() { self.options.muted = !self.options.muted; @@ -522,8 +522,15 @@ Ox.VideoPlayer = function(options, self) { */ self.$loadingIcon = Ox.LoadingIcon({video: true}) - .appendTo(self.$videoContainer) - .start(); + .hide() + .appendTo(self.$videoContainer); + if (!Ox.isEmpty( + Ox.isObject(self.options.video) + ? self.options.video[self.options.resolution] + : self.options.video + )) { + showLoadingIcon(); + } if (self.options.showIcon || self.options.showIconOnLoad) { self.$playIcon = $('')