mirror of
https://github.com/videojs/video.js.git
synced 2025-01-15 10:39:58 +02:00
Merge branch 'hotfix/fix-ie-controls-hiding' into stable
This commit is contained in:
commit
c4fb8b6fb4
@ -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
|
||||
|
@ -1,4 +1,4 @@
|
||||
---
|
||||
major: 3
|
||||
patch: 7
|
||||
patch: 8
|
||||
minor: 0
|
||||
|
8
src/controls.js
vendored
8
src/controls.js
vendored
@ -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();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user