web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-07-15 01:34:23 +02:00
Code Releases Activity

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

Browse Source
This commit is contained in:
Steve Heffernan
2012-01-23 16:02:50 -08:00
parent 3708b1b6a5 e967754c27
commit c4fb8b6fb4
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -19,3 +19,6 @@ CHANGELOG
---- 3.0.7 / 2012-01-12 / fixing-ie8-poster-bug -------------------------------- ---- 3.0.7 / 2012-01-12 / fixing-ie8-poster-bug --------------------------------
* Fixed an ie8 breaking bug with the poster * 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

2
VERSION.yml
View File

@ -1,4 +1,4 @@
--- ---
major: 3 major: 3
patch: 7 patch: 8
minor: 0 minor: 0

8
src/controls.js vendored
View File

@ -236,10 +236,18 @@ _V_.ControlBar = _V_.Component.extend({
// Used for transitions (fading out) // Used for transitions (fading out)
reveal: function(){ reveal: function(){
this.el.style.opacity = 1; this.el.style.opacity = 1;
// IE doesn't support opacity, so use display instead
if ( !('opacity' in document.body.style) ) {
this.show();
}
}, },
conceal: function(){ conceal: function(){
this.el.style.opacity = 0; this.el.style.opacity = 0;
if ( !('opacity' in document.body.style) ) {
this.hide();
}
} }
}); });