J has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57540
Change subject: Add option to set disablecontrols from wikitext
......................................................................
Add option to set disablecontrols from wikitext
Change-Id: I14a88fa48be4f1cf1a98dfad4326ca066efd154f
---
M TimedMediaHandler.i18n.magic.php
M TimedMediaHandler_body.php
M TimedMediaTransformOutput.php
3 files changed, 15 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/40/57540/1
diff --git a/TimedMediaHandler.i18n.magic.php b/TimedMediaHandler.i18n.magic.php
index 79624ac..878ceb1 100644
--- a/TimedMediaHandler.i18n.magic.php
+++ b/TimedMediaHandler.i18n.magic.php
@@ -14,6 +14,7 @@
'timedmedia_thumbtime' => array( 0, 'thumbtime=$1' ),
'timedmedia_starttime' => array( 0, 'start=$1'),
'timedmedia_endtime' => array( 0, 'end=$1'),
+ 'timedmedia_disablecontrols' => array( 0, 'disablecontrols=$1'),
);
$magicWords['af'] = array(
diff --git a/TimedMediaHandler_body.php b/TimedMediaHandler_body.php
index e3d94bb..0e9665c 100644
--- a/TimedMediaHandler_body.php
+++ b/TimedMediaHandler_body.php
@@ -25,6 +25,7 @@
'timedmedia_thumbtime' => 'thumbtime',
'timedmedia_starttime' => 'start',
'timedmedia_endtime' => 'end',
+ 'timedmedia_disablecontrols' => 'disablecontrols',
);
}
@@ -39,6 +40,13 @@
if ( $name == 'thumbtime' || $name == 'start' || $name == 'end'
) {
if ( $this->parseTimeString( $value ) === false ) {
return false;
+ }
+ } else if ( $name == 'disablecontrols' ) {
+ $values = explode( ',', $value);
+ foreach($values as $v) {
+ if ( !in_array( $v, array( 'options',
'timedText', 'fullscreen' ) ) ) {
+ return false;
+ }
}
}
return true;
@@ -321,6 +329,7 @@
'start' => isset( $params['start'] ) ? $params['start']
: false,
'end' => isset( $params['end'] ) ? $params['end'] :
false,
'fillwindow' => isset( $params['fillwindow'] ) ?
$params['fillwindow'] : false,
+ 'disablecontrols' => isset ( $params['disablecontrols']
) ? $params['disablecontrols'] : false
);
// No thumbs for audio
diff --git a/TimedMediaTransformOutput.php b/TimedMediaTransformOutput.php
index fc69e54..eed1ccb 100644
--- a/TimedMediaTransformOutput.php
+++ b/TimedMediaTransformOutput.php
@@ -8,6 +8,7 @@
var $textTracks = null;
var $hashTime = null;
var $textHandler = null; // lazy init in getTextHandler
+ var $disablecontrols = null;
var $start, $end, $fillwindow;
@@ -17,7 +18,7 @@
function __construct( $conf ){
$options = array( 'file', 'dstPath', 'sources', 'thumbUrl',
'start', 'end',
'width', 'height', 'length', 'offset', 'isVideo',
'path', 'fillwindow',
- 'sources' );
+ 'sources', 'disablecontrols' );
foreach ( $options as $key ) {
if( isset( $conf[ $key ]) ){
$this->$key = $conf[$key];
@@ -210,6 +211,9 @@
// We prefix some source attributes with data- to pass along to
the javascript player
$prefixedSourceAttr = Array( 'width', 'height', 'title',
'shorttitle', 'bandwidth', 'framerate', 'disablecontrols' );
foreach( $mediaSources as &$source ){
+ if ( $this->disablecontrols && !isset(
$source['disablecontrols'] ) ) {
+ $source['disablecontrols'] =
$this->disablecontrols;
+ }
foreach( $source as $attr => $val ){
if( in_array( $attr, $prefixedSourceAttr ) ){
$source[ 'data-' . $attr ] = $val;
--
To view, visit https://gerrit.wikimedia.org/r/57540
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I14a88fa48be4f1cf1a98dfad4326ca066efd154f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: J <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
