Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/236000
Change subject: Test: DO NOT MERGE
......................................................................
Test: DO NOT MERGE
Change-Id: I0f2253100cb9fb1aa39973412422e8d55ed54d36
---
M MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
M TimedMediaHandler.hooks.php
M TimedMediaHandler_body.php
M TimedMediaTransformOutput.php
M resources/PopUpThumbVideo.css
A resources/ext.tmh.thumbnail
A resources/ext.tmh.thumbnail.css
7 files changed, 25 insertions(+), 10 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/00/236000/1
diff --git
a/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
b/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
index 5ef54d4..60a82c6 100644
--- a/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
+++ b/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
@@ -370,7 +370,6 @@
getPlayButtonPosition: function() {
var _this = this;
return {
- 'position' : 'absolute',
'left' : '50%',
'top' : '50%',
'margin-left' : - .5 * this.getComponentWidth(
'playButtonLarge' ),
diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index 83432a3..54b7304 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -59,6 +59,9 @@
// Add the PopUpMediaTransform module ( specific to timedMedia
handler ( no support in mwEmbed modules )
$wgResourceModules+= array(
+ 'ext.tmh.thumbnail.styles' => $baseExtensionResource +
array(
+ 'styles' => 'resources/ext.tmh.thumbnail.css',
+ ),
'mw.PopUpMediaTransform' => $baseExtensionResource +
array(
'scripts' => 'resources/mw.PopUpThumbVideo.js',
'dependencies' => array( 'mw.MwEmbedSupport',
'mediawiki.Title', 'mw.PopUpMediaTransform.styles' ),
@@ -201,6 +204,7 @@
public static function onImageOpenShowImageInlineBefore( $imagePage,
$out ) {
$handler = $imagePage->getDisplayedFile()->getHandler();
if ( $handler !== false && $handler instanceof
TimedMediaHandler ) {
+ $out->addModuleStyles( 'ext.tmh.thumbnail.styles' );
$out->addModules( array(
'mw.TimedText.loader',
'mw.MediaWikiPlayer.loader',
@@ -456,6 +460,7 @@
}
if ( $addModules ) {
+ $out->addModuleStyles( 'ext.tmh.thumbnail.styles' );
$out->addModules( array(
'mw.TimedText.loader',
'mw.MediaWikiPlayer.loader',
diff --git a/TimedMediaHandler_body.php b/TimedMediaHandler_body.php
index c49cef1..20809d6 100644
--- a/TimedMediaHandler_body.php
+++ b/TimedMediaHandler_body.php
@@ -201,6 +201,7 @@
return ;
}
$parserOutput->hasTimedMediaTransform = true;
+ $parserOutput->addModuleStyles( 'ext.tmh.thumbnail.styles' );
$parserOutput->addModules( array(
'mw.TimedText.loader',
'mw.MediaWikiPlayer.loader',
diff --git a/TimedMediaTransformOutput.php b/TimedMediaTransformOutput.php
index 3653209..e743aa1 100644
--- a/TimedMediaTransformOutput.php
+++ b/TimedMediaTransformOutput.php
@@ -321,7 +321,7 @@
// Build the video tag output:
$s = Xml::tags( 'div' , array(
'class' => 'mediaContainer',
- 'style' =>
'position:relative;display:block;width:'. $width
+ 'style' => 'width:'. $width
),
Html::rawElement( $this->getTagName(),
$this->getMediaAttr( $sizeOverride, $autoPlay ),
// The set of media sources:
diff --git a/resources/PopUpThumbVideo.css b/resources/PopUpThumbVideo.css
index c55bb06..7e2722e 100644
--- a/resources/PopUpThumbVideo.css
+++ b/resources/PopUpThumbVideo.css
@@ -13,17 +13,9 @@
/* @embed */
background-image:url('player_big_play_button_hover.png');
}
-.PopUpMediaTransform {
- position : relative;
- display: inline-block;
-}
/* Should hopefully be only visible to screen readers */
.mw-tmh-playtext {
display: block;
height: 0;
overflow: hidden;
-}
-
-li.gallerybox div.thumb div.PopUpMediaTransform {
- margin: 0 auto;
}
diff --git a/resources/ext.tmh.thumbnail b/resources/ext.tmh.thumbnail
new file mode 100644
index 0000000..9464e5e
--- /dev/null
+++ b/resources/ext.tmh.thumbnail
@@ -0,0 +1,9 @@
+.mediaContainer,
+.PopUpMediaTransform {
+ position : relative;
+ display: block;
+}
+.thumb .mediaContainer,
+.thumb .PopUpMediaTransform {
+ margin: 0 auto;
+}
diff --git a/resources/ext.tmh.thumbnail.css b/resources/ext.tmh.thumbnail.css
new file mode 100644
index 0000000..9464e5e
--- /dev/null
+++ b/resources/ext.tmh.thumbnail.css
@@ -0,0 +1,9 @@
+.mediaContainer,
+.PopUpMediaTransform {
+ position : relative;
+ display: block;
+}
+.thumb .mediaContainer,
+.thumb .PopUpMediaTransform {
+ margin: 0 auto;
+}
--
To view, visit https://gerrit.wikimedia.org/r/236000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f2253100cb9fb1aa39973412422e8d55ed54d36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
