Skip to content

Commit

Permalink
- Bind hide on ended event to resolve issue videojs#1028.
Browse files Browse the repository at this point in the history
- Remove duplicate seeked event line.
  • Loading branch information
tomjohnson916 committed Mar 12, 2014
1 parent e7b1098 commit 378d6ef
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/js/loading-spinner.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ vjs.LoadingSpinner = vjs.Component.extend({
player.on('canplay', vjs.bind(this, this.hide));
player.on('canplaythrough', vjs.bind(this, this.hide));
player.on('playing', vjs.bind(this, this.hide));
player.on('seeked', vjs.bind(this, this.hide));

player.on('seeking', vjs.bind(this, this.show));

// in some browsers seeking does not trigger the 'playing' event,
Expand All @@ -25,6 +23,7 @@ vjs.LoadingSpinner = vjs.Component.extend({
player.on('seeked', vjs.bind(this, this.hide));

player.on('error', vjs.bind(this, this.show));
player.on('ended', vjs.bind(this, this.hide));

// Not showing spinner on stalled any more. Browsers may stall and then not trigger any events that would remove the spinner.
// Checked in Chrome 16 and Safari 5.1.2. http://help.videojs.com/discussions/problems/883-why-is-the-download-progress-showing
Expand Down

0 comments on commit 378d6ef

Please sign in to comment.