TheDJ has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354736 )
Change subject: Only add the resolution switcher to video files
......................................................................
Only add the resolution switcher to video files
Adding this button is problematic, since we don't really need it in
audio players, and the module also wasn't compatible with audio only
files.
Change-Id: Ie90a16187d7c7fc5181a9b5a2963c3939f97668b
---
M resources/ext.tmh.player.js
1 file changed, 23 insertions(+), 19 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/36/354736/1
diff --git a/resources/ext.tmh.player.js b/resources/ext.tmh.player.js
index 8e6f054..77ab011 100755
--- a/resources/ext.tmh.player.js
+++ b/resources/ext.tmh.player.js
@@ -1,6 +1,6 @@
/* global videojs */
( function ( $, mw, videojs ) {
- var globalConfig, audioConfig, playerConfig;
+ var globalConfig, videoConfig, audioConfig, playerConfig;
globalConfig = {
language: mw.config.get( 'wgUserLanguage' ),
@@ -13,17 +13,6 @@
},
techOrder: [ 'html5' ],
plugins: {
- videoJsResolutionSwitcher: {
- sourceOrder: true,
- customSourcePicker: function ( player,
sources/* , label */ ) {
- // Resolution switcher gets confused by
preload=none on ogv.js
- if ( player.preload() === 'none' ) {
- player.preload( 'metadata' );
- }
- player.src( sources );
- return player;
- }
- },
responsiveLayout: {
layoutMap: [
{ layoutClassName: 'vjs-layout-tiny',
width: 3 },
@@ -34,6 +23,22 @@
},
replayButton: {},
infoButton: {}
+ }
+ };
+
+ videoConfig = {
+ plugins: {
+ videoJsResolutionSwitcher: {
+ sourceOrder: true,
+ customSourcePicker: function ( player,
sources/* , label */ ) {
+ // Resolution switcher gets confused by
preload=none on ogv.js
+ if ( player.preload() === 'none' ) {
+ player.preload( 'metadata' );
+ }
+ player.src( sources );
+ return player;
+ }
+ }
}
};
@@ -52,18 +57,17 @@
function loadSinglePlayer( index ) {
var i, l, preload, resolutions, playerHeight,
defaultRes,
videoplayer = this,
- $videoplayer = $( this );
+ $videoplayer = $( this ),
+ isAudio = videoplayer.tagName.toLowerCase() ===
'audio';
if ( $videoplayer.closest( '.video-js' ).length ) {
// This player has already been transformed.
return;
}
+
playerConfig = $.extend( {}, globalConfig );
- if ( videoplayer.tagName.toLowerCase() === 'audio' ) {
- // We hide the big play button, show the
controlbar with CSS
- // We remove the fullscreen button
- playerConfig = $.extend( true, {},
playerConfig, audioConfig );
- }
+ playerConfig = $.extend( true, {}, playerConfig,
isAudio ? audioConfig : videoConfig );
+
// Future interactions go faster if we've preloaded a
little
preload = 'metadata';
if ( !mw.OgvJsSupport.canPlayNatively() ) {
@@ -117,7 +121,7 @@
break;
}
}
- if ( defaultRes ) {
+ if ( !isAudio && defaultRes ) {
playerConfig.plugins.videoJsResolutionSwitcher[
'default' ] = defaultRes;
}
--
To view, visit https://gerrit.wikimedia.org/r/354736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie90a16187d7c7fc5181a9b5a2963c3939f97668b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: TheDJ <hartman.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
