Skip to content

Commit

Permalink
2.16.4 build
Browse files Browse the repository at this point in the history
  • Loading branch information
@johndyer
johndyer committed Mar 1, 2015
1 parent d15be7a commit 5379e57
Show file tree
Hide file tree
Showing 10 changed files with 95 additions and 68 deletions.
Binary file modified build/flashmediaelement-cdn.swf
View file
Binary file not shown.
Binary file modified build/flashmediaelement.swf
View file
Binary file not shown.
73 changes: 43 additions & 30 deletions build/mediaelement-and-player.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
var mejs = mejs || {};

// version number
mejs.version = '2.16.3';
mejs.version = '2.16.4';


// player number (for missing, same id attr)
Expand Down Expand Up @@ -1395,33 +1395,33 @@ mejs.HtmlMediaElementShim = {
container.innerHTML ='<iframe src="//player.vimeo.com/video/' + pluginMediaElement.vimeoid + '?api=1&portrait=0&byline=0&title=0&player_id=' + player_id + '" width="' + width +'" height="' + height +'" frameborder="0" class="mejs-shim" id="' + player_id + '" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>';
if (typeof($f) == 'function') { // froogaloop available
var player = $f(container.childNodes[0]);

player.addEvent('ready', function() {
$.extend( player, {
playVideo: function() {
player.api( 'play' );
},
stopVideo: function() {
player.api( 'unload' );
},
pauseVideo: function() {
player.api( 'pause' );
},
seekTo: function( seconds ) {
player.api( 'seekTo', seconds );
},
setVolume: function( volume ) {
player.api( 'setVolume', volume );
},
setMuted: function( muted ) {
if( muted ) {
player.lastVolume = player.api( 'getVolume' );
player.api( 'setVolume', 0 );
} else {
player.api( 'setVolume', player.lastVolume );
delete player.lastVolume;
}

player.playVideo = function() {
player.api( 'play' );
}
player.stopVideo = function() {
player.api( 'unload' );
}
player.pauseVideo = function() {
player.api( 'pause' );
}
player.seekTo = function( seconds ) {
player.api( 'seekTo', seconds );
}
player.setVolume = function( volume ) {
player.api( 'setVolume', volume );
}
player.setMuted = function( muted ) {
if( muted ) {
player.lastVolume = player.api( 'getVolume' );
player.api( 'setVolume', 0 );
} else {
player.api( 'setVolume', player.lastVolume );
delete player.lastVolume;
}
});
}

function createEvent(player, pluginMediaElement, eventName, e) {
var obj = {
Expand Down Expand Up @@ -3195,6 +3195,11 @@ if (typeof jQuery != 'undefined') {
}
t.globalUnbind();
delete t.node.player;
},
rebuildtracks: function(){
var t = this;
t.findTracks();
t.buildtracks(t, t.controls, t.layers, t.media);
}
};

Expand Down Expand Up @@ -3381,8 +3386,8 @@ if (typeof jQuery != 'undefined') {
buildprogress: function(player, controls, layers, media) {

$('<div class="mejs-time-rail">' +
'<a href="javascript:void(0);" class="mejs-time-total mejs-time-slider">' +
'<span class="mejs-offscreen">' + this.options.progessHelpText + '</span>' +
'<span class="mejs-time-total mejs-time-slider">' +
//'<span class="mejs-offscreen">' + this.options.progessHelpText + '</span>' +
'<span class="mejs-time-buffering"></span>' +
'<span class="mejs-time-loaded"></span>' +
'<span class="mejs-time-current"></span>' +
Expand All @@ -3391,7 +3396,6 @@ if (typeof jQuery != 'undefined') {
'<span class="mejs-time-float-current">00:00</span>' +
'<span class="mejs-time-float-corner"></span>' +
'</span>' +
'</a>' +
'</div>')
.appendTo(controls);
controls.find('.mejs-time-buffering').hide();
Expand Down Expand Up @@ -4548,7 +4552,7 @@ if (typeof jQuery != 'undefined') {
var newSpeed = $(this).attr('value');
playbackspeed = newSpeed;
media.playbackRate = parseFloat(newSpeed);
speedButton.find('button').html('test' + newSpeed + t.options.speedChar);
speedButton.find('button').html(newSpeed + t.options.speedChar);
speedButton.find('.mejs-speed-selected').removeClass('mejs-speed-selected');
speedButton.find('input[type="radio"]:checked').next().addClass('mejs-speed-selected');
});
Expand Down Expand Up @@ -4587,6 +4591,14 @@ if (typeof jQuery != 'undefined') {

hasChapters: false,

cleartracks: function(player, controls, layers, media){
if(player) {
if(player.captions) player.captions.remove();
if(player.chapters) player.chapters.remove();
if(player.captionsText) player.captionsText.remove();
if(player.captionsButton) player.captionsButton.remove();
}
},
buildtracks: function(player, controls, layers, media) {
if (player.tracks.length === 0)
return;
Expand All @@ -4600,6 +4612,7 @@ if (typeof jQuery != 'undefined') {
t.domNode.textTracks[i].mode = "hidden";
}
}
t.cleartracks(player, controls, layers, media);
player.chapters =
$('<div class="mejs-chapters mejs-layer"></div>')
.prependTo(layers).hide();
Expand Down
6 changes: 3 additions & 3 deletions build/mediaelement-and-player.min.js
View file

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions build/mediaelement.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
var mejs = mejs || {};

// version number
mejs.version = '2.16.3';
mejs.version = '2.16.4';


// player number (for missing, same id attr)
Expand Down Expand Up @@ -1395,33 +1395,33 @@ mejs.HtmlMediaElementShim = {
container.innerHTML ='<iframe src="//player.vimeo.com/video/' + pluginMediaElement.vimeoid + '?api=1&portrait=0&byline=0&title=0&player_id=' + player_id + '" width="' + width +'" height="' + height +'" frameborder="0" class="mejs-shim" id="' + player_id + '" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>';
if (typeof($f) == 'function') { // froogaloop available
var player = $f(container.childNodes[0]);

player.addEvent('ready', function() {
$.extend( player, {
playVideo: function() {
player.api( 'play' );
},
stopVideo: function() {
player.api( 'unload' );
},
pauseVideo: function() {
player.api( 'pause' );
},
seekTo: function( seconds ) {
player.api( 'seekTo', seconds );
},
setVolume: function( volume ) {
player.api( 'setVolume', volume );
},
setMuted: function( muted ) {
if( muted ) {
player.lastVolume = player.api( 'getVolume' );
player.api( 'setVolume', 0 );
} else {
player.api( 'setVolume', player.lastVolume );
delete player.lastVolume;
}

player.playVideo = function() {
player.api( 'play' );
}
player.stopVideo = function() {
player.api( 'unload' );
}
player.pauseVideo = function() {
player.api( 'pause' );
}
player.seekTo = function( seconds ) {
player.api( 'seekTo', seconds );
}
player.setVolume = function( volume ) {
player.api( 'setVolume', volume );
}
player.setMuted = function( muted ) {
if( muted ) {
player.lastVolume = player.api( 'getVolume' );
player.api( 'setVolume', 0 );
} else {
player.api( 'setVolume', player.lastVolume );
delete player.lastVolume;
}
});
}

function createEvent(player, pluginMediaElement, eventName, e) {
var obj = {
Expand Down
2 changes: 1 addition & 1 deletion build/mediaelement.min.js
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion build/mediaelementplayer.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/* Accessibility: hide screen reader texts (and prefer "top" for RTL languages). */
position: absolute !important;
top: -10000px;
left: -10000px;
overflow: hidden;
width: 1px;
height: 1px;
Expand Down Expand Up @@ -194,7 +195,7 @@
background-image: url(controls.png);
}

/* :focus for accessibility */
/* :focus for accessibility */
.mejs-controls .mejs-button button:focus {
outline: dotted 1px #999;
}
Expand Down
21 changes: 17 additions & 4 deletions build/mediaelementplayer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1279,6 +1279,11 @@ if (typeof jQuery != 'undefined') {
}
t.globalUnbind();
delete t.node.player;
},
rebuildtracks: function(){
var t = this;
t.findTracks();
t.buildtracks(t, t.controls, t.layers, t.media);
}
};

Expand Down Expand Up @@ -1465,8 +1470,8 @@ if (typeof jQuery != 'undefined') {
buildprogress: function(player, controls, layers, media) {

$('<div class="mejs-time-rail">' +
'<a href="javascript:void(0);" class="mejs-time-total mejs-time-slider">' +
'<span class="mejs-offscreen">' + this.options.progessHelpText + '</span>' +
'<span class="mejs-time-total mejs-time-slider">' +
//'<span class="mejs-offscreen">' + this.options.progessHelpText + '</span>' +
'<span class="mejs-time-buffering"></span>' +
'<span class="mejs-time-loaded"></span>' +
'<span class="mejs-time-current"></span>' +
Expand All @@ -1475,7 +1480,6 @@ if (typeof jQuery != 'undefined') {
'<span class="mejs-time-float-current">00:00</span>' +
'<span class="mejs-time-float-corner"></span>' +
'</span>' +
'</a>' +
'</div>')
.appendTo(controls);
controls.find('.mejs-time-buffering').hide();
Expand Down Expand Up @@ -2632,7 +2636,7 @@ if (typeof jQuery != 'undefined') {
var newSpeed = $(this).attr('value');
playbackspeed = newSpeed;
media.playbackRate = parseFloat(newSpeed);
speedButton.find('button').html('test' + newSpeed + t.options.speedChar);
speedButton.find('button').html(newSpeed + t.options.speedChar);
speedButton.find('.mejs-speed-selected').removeClass('mejs-speed-selected');
speedButton.find('input[type="radio"]:checked').next().addClass('mejs-speed-selected');
});
Expand Down Expand Up @@ -2671,6 +2675,14 @@ if (typeof jQuery != 'undefined') {

hasChapters: false,

cleartracks: function(player, controls, layers, media){
if(player) {
if(player.captions) player.captions.remove();
if(player.chapters) player.chapters.remove();
if(player.captionsText) player.captionsText.remove();
if(player.captionsButton) player.captionsButton.remove();
}
},
buildtracks: function(player, controls, layers, media) {
if (player.tracks.length === 0)
return;
Expand All @@ -2684,6 +2696,7 @@ if (typeof jQuery != 'undefined') {
t.domNode.textTracks[i].mode = "hidden";
}
}
t.cleartracks(player, controls, layers, media);
player.chapters =
$('<div class="mejs-chapters mejs-layer"></div>')
.prependTo(layers).hide();
Expand Down
2 changes: 1 addition & 1 deletion build/mediaelementplayer.min.css
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/mediaelementplayer.min.js
View file

Large diffs are not rendered by default.

0 comments on commit 5379e57

Please sign in to comment.