Merge branch 'hotfix/fix-ie-controls-hiding' into stable

nakbontam · Jan 24, 2012 · c4fb8b6 · c4fb8b6
2 parents 3708b1b + e967754
commit c4fb8b6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,3 +19,6 @@ CHANGELOG
 
 ---- 3.0.7 / 2012-01-12 / fixing-ie8-poster-bug --------------------------------
 * Fixed an ie8 breaking bug with the poster
+
+---- 3.0.8 / 2012-01-23 / fix-ie-controls-hiding -------------------------------
+* CFixed issue with controls not hiding in IE due to no opacity support
diff --git a/VERSION.yml b/VERSION.yml
@@ -1,4 +1,4 @@
 --- 
 major: 3
-patch: 7
+patch: 8
 minor: 0
diff --git a/src/controls.js b/src/controls.js
@@ -236,10 +236,18 @@ _V_.ControlBar = _V_.Component.extend({
   // Used for transitions (fading out)
   reveal: function(){
     this.el.style.opacity = 1;
+
+    // IE doesn't support opacity, so use display instead
+    if ( !('opacity' in document.body.style) ) {
+      this.show();
+    }
   },
 
   conceal: function(){
     this.el.style.opacity = 0;
+    if ( !('opacity' in document.body.style) ) {
+      this.hide();
+    }
   }
 });