Skip to content

Commit

Permalink
Merge branch 'hotfix/fix-chrome-seeking-spinner' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
heff committed Nov 13, 2012
2 parents 3540fcf + efb357f commit 54ef0a7
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,6 @@ CHANGELOG

---- 3.2.2 / 2012-05-02 / multiple-control-fades-fix ---------------------------
* Fixed error with multiple controls fading listeners

---- 3.2.3 / 2012-11-12 / fix-chrome-seeking-spinner ---------------------------
* Fixed chrome spinner continuing on seek
7 changes: 4 additions & 3 deletions VERSION.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
minor: 2
---
major: 3
patch: 2
minor: 2
patch: 3
pre:
8 changes: 7 additions & 1 deletion src/controls.js
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,12 @@ _V_.LoadingSpinner = _V_.Component.extend({
player.addEvent("playing", _V_.proxy(this, this.hide));

player.addEvent("seeking", _V_.proxy(this, this.show));

// in some browsers seeking does not trigger the 'playing' event,
// so we also need to trap 'seeked' if we are going to set a
// 'seeking' event
player.addEvent("seeked", _V_.proxy(this, this.hide));

player.addEvent("error", _V_.proxy(this, this.show));

// Not showing spinner on stalled any more. Browsers may stall and then not trigger any events that would remove the spinner.
Expand Down Expand Up @@ -843,4 +849,4 @@ _V_.MenuItem = _V_.Button.extend({
}
}

});
});

0 comments on commit 54ef0a7

Please sign in to comment.