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

Merge branch 'hotfix/multiple-control-fades-fix' into stable

Browse Source
This commit is contained in:
Steve Heffernan 2012-05-02 20:55:57 -07:00
commit 3540fcfee8
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -50,3 +50,6 @@ CHANGELOG
---- 3.2.1 / 2012-04-06 / options-width-fix ------------------------------------
* Fixed setting width/height with javascript options
---- 3.2.2 / 2012-05-02 / multiple-control-fades-fix ---------------------------
* Fixed error with multiple controls fading listeners

2
VERSION.yml
View File

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

2
src/controls.js vendored
View File

@ -30,7 +30,7 @@ _V_.ControlBar = _V_.Component.extend({
init: function(player, options){
this._super(player, options);
player.addEvent("play", this.proxy(function(){
player.one("play", this.proxy(function(){
this.fadeIn();
this.player.addEvent("mouseover", this.proxy(this.fadeIn));
this.player.addEvent("mouseout", this.proxy(this.fadeOut));