Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:johndyer/mediaelement

  • Loading branch information...
commit 40b76bccf8748204805afac7d5eeaa76be71185a 2 parents 3b97dd5 + 8660028
@gavinlynch authored
Showing with 9 additions and 7 deletions.
  1. +9 −7 src/js/mep-feature-fullscreen.js
View
16 src/js/mep-feature-fullscreen.js
@@ -120,10 +120,13 @@
.width('100%')
.height('100%');
//.css({position: 'fixed', left: 0, top: 0, right: 0, bottom: 0, overflow: 'hidden', width: '100%', height: '100%', 'z-index': 1000});
- setTimeout(function() {
- t.container.css({width: '100%', height: '100%'});
- }, 500);
- //console.log('fullscreen', t.container.width());
+
+ // Only needed for safari 5.1 native full screen, can cause display issues elsewhere
+ if (mejs.MediaFeatures.hasTrueNativeFullScreen) {
+ setTimeout(function() {
+ t.container.css({width: '100%', height: '100%'});
+ }, 500);
+ }
if (t.pluginType === 'native') {
t.$media
@@ -172,8 +175,7 @@
t.container
.removeClass('mejs-container-fullscreen')
.width(normalWidth)
- .height(normalHeight)
- .css('z-index', 1);
+ .height(normalHeight);
//.css({position: '', left: '', top: '', right: '', bottom: '', overflow: 'inherit', width: normalWidth + 'px', height: normalHeight + 'px', 'z-index': 1});
if (t.pluginType === 'native') {
@@ -201,4 +203,4 @@
}
});
-})(mejs.$);
+})(mejs.$);
Please sign in to comment.
Something went wrong with that request. Please try again.