web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-01-19 10:54:16 +02:00
Code Releases Activity

@dmlap removed an ie6 hack for flash object embedding. closes #1946

Browse Source
This commit is contained in:
David LaPalomento 2015-03-12 11:17:53 -07:00 committed by heff
parent cd48d03945
commit 93ea3cee1c
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@ CHANGELOG
## HEAD (Unreleased) ## HEAD (Unreleased)
* @mmcc updated the slider to allow for vertical orientation ([view](https://github.com/videojs/video.js/pull/1816)) * @mmcc updated the slider to allow for vertical orientation ([view](https://github.com/videojs/video.js/pull/1816))
* @dmlap removed an ie6 hack for flash object embedding ([view](https://github.com/videojs/video.js/pull/1946))
-------------------- --------------------

9
src/js/media/flash.js
View File

@ -365,16 +365,7 @@ vjs.Flash.embed = function(swf, placeHolder, flashVars, params, attributes){
; ;
placeHolder.parentNode.replaceChild(obj, placeHolder); placeHolder.parentNode.replaceChild(obj, placeHolder);
// IE6 seems to have an issue where it won't initialize the swf object after injecting it.
// This is a dumb fix
var newObj = par.childNodes[0];
setTimeout(function(){
newObj.style.display = 'block';
}, 1000);
return obj; return obj;
}; };
vjs.Flash.getEmbedCode = function(swf, flashVars, params, attributes){ vjs.Flash.getEmbedCode = function(swf, flashVars, params, attributes){