web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2024-12-21 01:39:04 +02:00
Code Releases Activity

Merge branch 'hotfix/fix-chrome-seeking-spinner' into stable

Browse Source
This commit is contained in:
Steve Heffernan 2012-11-12 17:29:12 -08:00
commit 54ef0a7758
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -53,3 +53,6 @@ CHANGELOG
---- 3.2.2 / 2012-05-02 / multiple-control-fades-fix --------------------------- ---- 3.2.2 / 2012-05-02 / multiple-control-fades-fix ---------------------------
* Fixed error with multiple controls fading listeners * Fixed error with multiple controls fading listeners
---- 3.2.3 / 2012-11-12 / fix-chrome-seeking-spinner ---------------------------
* Fixed chrome spinner continuing on seek

5
VERSION.yml
View File

@ -1,4 +1,5 @@
--- ---
minor: 2
major: 3 major: 3
patch: 2 minor: 2
patch: 3
pre:

6
src/controls.js vendored
View File

@ -239,6 +239,12 @@ _V_.LoadingSpinner = _V_.Component.extend({
player.addEvent("playing", _V_.proxy(this, this.hide)); player.addEvent("playing", _V_.proxy(this, this.hide));
player.addEvent("seeking", _V_.proxy(this, this.show)); 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)); 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. // Not showing spinner on stalled any more. Browsers may stall and then not trigger any events that would remove the spinner.