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

hanasan · May 3, 2012 · 3540fcf · 3540fcf
2 parents 5fc725c + f82312e
commit 3540fcf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
diff --git a/VERSION.yml b/VERSION.yml
@@ -1,4 +1,4 @@
 --- 
 minor: 2
 major: 3
-patch: 1
+patch: 2
diff --git a/src/controls.js b/src/controls.js
@@ -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));