diff --git a/CHANGELOG.md b/CHANGELOG.md index 2401902cc..016caec99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/VERSION.yml b/VERSION.yml index 00424cdc7..7a7c5ae96 100644 --- a/VERSION.yml +++ b/VERSION.yml @@ -1,4 +1,5 @@ ---- -minor: 2 +--- major: 3 -patch: 2 +minor: 2 +patch: 3 +pre: diff --git a/src/controls.js b/src/controls.js index 2b38631b1..a04caf1fb 100644 --- a/src/controls.js +++ b/src/controls.js @@ -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. @@ -843,4 +849,4 @@ _V_.MenuItem = _V_.Button.extend({ } } -}); \ No newline at end of file +});