mirror of
https://github.com/videojs/video.js.git
synced 2024-12-21 01:39:04 +02:00
Merge branch 'hotfix/fix-chrome-seeking-spinner' into stable
This commit is contained in:
commit
54ef0a7758
@ -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
|
||||
|
@ -1,4 +1,5 @@
|
||||
---
|
||||
minor: 2
|
||||
---
|
||||
major: 3
|
||||
patch: 2
|
||||
minor: 2
|
||||
patch: 3
|
||||
pre:
|
||||
|
8
src/controls.js
vendored
8
src/controls.js
vendored
@ -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({
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user