Skip to content

Commit

Permalink
2.22.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@rafa8626
rafa8626 committed Aug 19, 2016
1 parent 6ceb4d2 commit ef5cf86
Show file tree
Hide file tree
Showing 9 changed files with 79 additions and 50 deletions.
Binary file modified build/flashmediaelement-cdn.swf
View file
Binary file not shown.
Binary file modified build/flashmediaelement-debug.swf
View file
Binary file not shown.
Binary file modified build/flashmediaelement.swf
View file
Binary file not shown.
34 changes: 25 additions & 9 deletions build/mediaelement-and-player.js
View file
Expand Up @@ -2430,7 +2430,7 @@ if (typeof jQuery != 'undefined') {
.addClass(t.$media[0].className)
.insertBefore(t.$media)
.focus(function ( e ) {
if( !t.controlsAreVisible && !t.hasFocus ) {
if( !t.controlsAreVisible && !t.hasFocus && t.controlsEnabled) {
t.showControls(true);
// In versions older than IE11, the focus causes the playbar to be displayed
// if user clicks on the Play/Pause button in the control bar once it attempts
Expand Down Expand Up @@ -2732,6 +2732,10 @@ if (typeof jQuery != 'undefined') {
} else {
t.pause();
}

var button = t.$media.closest('.mejs-container').find('.mejs-overlay-button'),
pressed = button.attr('aria-pressed');
button.attr('aria-pressed', !pressed);
}
};

Expand Down Expand Up @@ -2878,7 +2882,10 @@ if (typeof jQuery != 'undefined') {
var $target = $(e.relatedTarget);
if (t.keyboardAction && $target.parents('.mejs-container').length === 0) {
t.keyboardAction = false;
t.hideControls(true);
if (t.isVideo && !t.options.alwaysShowControls) {
t.hideControls(true);
}

}
}
});
Expand Down Expand Up @@ -3247,14 +3254,18 @@ if (typeof jQuery != 'undefined') {
// this needs to come last so it's on top
bigPlay =
$('<div class="mejs-overlay mejs-layer mejs-overlay-play">'+
'<div class="mejs-overlay-button"></div>'+
'<div class="mejs-overlay-button" role="button" aria-label="' + mejs.i18n.t('Play') + '" aria-pressed="false"></div>'+
'</div>')
.appendTo(layers)
.bind('click', function() { // Removed 'touchstart' due issues on Samsung Android devices where a tap on bigPlay started and immediately stopped the video
if (t.options.clickToPlayPause) {
if (media.paused) {
media.play();
}

var button = $(this).find('.mejs-overlay-button'),
pressed = button.attr('aria-pressed');
button.attr('aria-pressed', !!pressed);
}
});

Expand Down Expand Up @@ -3807,8 +3818,8 @@ if (typeof jQuery != 'undefined') {
var keyCode = e.keyCode,
duration = media.duration,
seekTime = media.currentTime,
seekForward = player.options.defaultSeekForwardInterval(duration),
seekBackward = player.options.defaultSeekBackwardInterval(duration);
seekForward = player.options.defaultSeekForwardInterval(media),
seekBackward = player.options.defaultSeekBackwardInterval(media);

switch (keyCode) {
case 37: // left
Expand Down Expand Up @@ -3988,7 +3999,10 @@ if (typeof jQuery != 'undefined') {
t.currenttime = t.controls.find('.mejs-currenttime');

media.addEventListener('timeupdate',function() {
player.updateCurrent();
if (t.controlsAreVisible) {
player.updateCurrent();
}

}, false);
},

Expand Down Expand Up @@ -4018,7 +4032,9 @@ if (typeof jQuery != 'undefined') {
t.durationD = t.controls.find('.mejs-duration');

media.addEventListener('timeupdate',function() {
player.updateDuration();
if (t.controlsAreVisible) {
player.updateDuration();
}
}, false);
},

Expand Down Expand Up @@ -4646,8 +4662,8 @@ if (typeof jQuery != 'undefined') {

var t = this;

if (mejs.MediaFeatures.hasiOSFullScreen) {
t.media.webkitEnterFullscreen();
if (mejs.MediaFeatures.isiOS && mejs.MediaFeatures.hasiOSFullScreen && typeof t.media.webkitEnterFullscreen === 'function') {
t.media.webkitEnterFullscreen();
return;
}

Expand Down
4 changes: 2 additions & 2 deletions build/mediaelement-and-player.min.js
View file

Large diffs are not rendered by default.

51 changes: 24 additions & 27 deletions build/mediaelementplayer.css
View file
Expand Up @@ -12,7 +12,7 @@
.mejs-container {
position: relative;
background: #000;
font-family: Helvetica, Arial;
font-family: "Helvetica", Arial, serif;
text-align: left;
vertical-align: top;
text-indent: 0;
Expand Down Expand Up @@ -98,7 +98,6 @@
.mejs-poster img {
border: 0;
padding: 0;
border: 0;
}

.mejs-overlay {
Expand All @@ -118,11 +117,11 @@
width: 100px;
height: 100px;
margin: -50px 0 0 -50px;
background: url(bigplay.svg) no-repeat;
background: url("bigplay.svg") no-repeat;
}

.no-svg .mejs-overlay-button {
background-image: url(bigplay.png);
background-image: url("bigplay.png");
}

.mejs-overlay:hover .mejs-overlay-button {
Expand All @@ -137,7 +136,7 @@
height: 80px;
margin: -40px 0 0 -40px;
background: #333;
background: url(background.png);
background: url("background.png");
background: rgba(0, 0, 0, 0.9);
background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(50,50,50,0.9)), to(rgba(0,0,0,0.9)));
background: -webkit-linear-gradient(top, rgba(50,50,50,0.9), rgba(0,0,0,0.9));
Expand All @@ -151,7 +150,7 @@
display: block;
width: 80px;
height: 80px;
background: transparent url(loading.gif) 50% 50% no-repeat;
background: transparent url("loading.gif") 50% 50% no-repeat;
}

/* End: LAYERS */
Expand All @@ -164,7 +163,7 @@
padding: 0;
bottom: 0;
left: 0;
background: url(background.png);
background: url("background.png");
background: rgba(0, 0, 0, 0.7);
background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(50,50,50,0.7)), to(rgba(0,0,0,0.7)));
background: -webkit-linear-gradient(top, rgba(50,50,50,0.7), rgba(0,0,0,0.7));
Expand All @@ -186,7 +185,7 @@
height: 26px;
font-size: 11px;
line-height: 11px;
font-family: Helvetica, Arial;
font-family: "Helvetica", Arial, serif;
border: 0;
}

Expand All @@ -202,11 +201,11 @@
height: 16px;
width: 16px;
border: 0;
background: transparent url(controls.svg) no-repeat;
background: transparent url("controls.svg") no-repeat;
}

.no-svg .mejs-controls .mejs-button button {
background-image: url(controls.png);
background-image: url("controls.png");
}

/* :focus for accessibility */
Expand Down Expand Up @@ -435,7 +434,7 @@
display: none;
height: 115px;
width: 25px;
background: url(background.png);
background: url("background.png");
background: rgba(50, 50, 50, 0.7);
-webkit-border-radius: 0;
-moz-border-radius: 0;
Expand Down Expand Up @@ -571,7 +570,7 @@
right: -51px;
width: 85px;
height: 100px;
background: url(background.png);
background: url("background.png");
background: rgba(50,50,50,0.7);
border: solid 1px transparent;
padding: 10px 10px 0 10px;
Expand Down Expand Up @@ -613,7 +612,7 @@
float: left;
padding: 4px 0 0 0;
line-height: 15px;
font-family: helvetica, arial;
font-family: "Helvetica", Arial, serif;
font-size: 10px;
}

Expand All @@ -626,7 +625,7 @@
position: absolute;
top: 0;
left: 0;
-xborder-right: solid 1px #fff;
border-right: solid 1px #fff;
width: 10000px;
z-index: 1;
}
Expand Down Expand Up @@ -725,7 +724,7 @@

.mejs-captions-text {
padding: 3px 5px;
background: url(background.png);
background: url("background.png");
background: rgba(20, 20, 20, 0.5);
white-space: pre-wrap;
}
Expand Down Expand Up @@ -795,7 +794,7 @@
}

.mejs-contextmenu .mejs-contextmenu-item {
font-family: Helvetica, Arial;
font-family: "Helvetica", Arial, serif;
font-size: 12px;
padding: 4px 6px;
cursor: pointer;
Expand All @@ -822,7 +821,7 @@
right: -10px;
width: 130px;
height: 100px;
background: url(background.png);
background: url("background.png");
background: rgba(50,50,50,0.7);
border: solid 1px transparent;
padding: 10px;
Expand Down Expand Up @@ -860,7 +859,7 @@
float: left;
padding: 4px 0 0 0;
line-height: 15px;
font-family: helvetica, arial;
font-family: "Helvetica", Arial, serif;
font-size: 10px;
}
/* End: Source Chooser */
Expand All @@ -872,7 +871,7 @@
left: 0;
width: 100%;
height: 100%;
background: url(background.png);
background: url("background.png");
background: rgba(50,50,50,0.7);
z-index: 1000;
overflow: hidden;
Expand All @@ -885,7 +884,7 @@
position: absolute;
right: 0;
top: 0;
background: url(background.png);
background: url("background.png");
background: rgba(50,50,50,0.7);
color: #fff;
padding: 4px;
Expand Down Expand Up @@ -916,7 +915,7 @@ div.mejs-speed-button {
left: -10px;
width: 60px;
height: 100px;
background: url(background.png);
background: url("background.png");
background: rgba(50, 50, 50, 0.7);
border: solid 1px transparent;
padding: 0;
Expand Down Expand Up @@ -964,8 +963,8 @@ div.mejs-speed-button {
float: left;
padding: 4px 0 0 0;
line-height: 15px;
font-family: helvetica, arial;
font-size: 11.5px;
font-family: "Helvetica", Arial, serif;
font-size: 11px;
color: white;
margin-left: 5px;
cursor: pointer;
Expand All @@ -980,8 +979,7 @@ div.mejs-speed-button {
/* Start: Jump Forward */

.mejs-controls .mejs-button.mejs-jump-forward-button {
background: transparent url(jumpforward.png) no-repeat;
background-position: 3px 3px;
background: transparent url("jumpforward.png") no-repeat 3px 3px;
}
.mejs-controls .mejs-button.mejs-jump-forward-button button {
background: transparent;
Expand All @@ -995,8 +993,7 @@ div.mejs-speed-button {
/* Start: Skip Back */

.mejs-controls .mejs-button.mejs-skip-back-button {
background: transparent url(skipback.png) no-repeat;
background-position: 3px 3px;
background: transparent url("skipback.png") no-repeat 3px 3px;
}
.mejs-controls .mejs-button.mejs-skip-back-button button {
background: transparent;
Expand Down

0 comments on commit ef5cf86

Please sign in to comment.