web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2024-12-31 03:11:11 +02:00
Code Releases Activity

Merge branch 'hotfix/fix-chrome-seeking-spinner' fixes #240

Browse Source 
Conflicts:
	src/controls.js
This commit is contained in:
Steve Heffernan 2012-11-12 17:32:44 -08:00
commit fc6d1b1229
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -62,3 +62,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
VERSION.yml
View File

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

12
src/controls.js vendored
View File

@ -239,8 +239,14 @@ _V_.LoadingSpinner = _V_.Component.extend({
player.on("playing", _V_.proxy(this, this.hide));
player.on("seeked", _V_.proxy(this, this.hide));
player.on("seeking", _V_.proxy(this, this.show));
player.on("error", _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));
// 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
@ -844,4 +850,4 @@ _V_.MenuItem = _V_.Button.extend({
}
}
});
});