Mdale has submitted this change and it was merged.
Change subject: Don't use the "Pop-up" video viewer thing during iframe embed.
......................................................................
Don't use the "Pop-up" video viewer thing during iframe embed.
First of all, if you're including the video as an iframe,
having some sort of javascript fake pop up window is probably
going to look really bad.
Second, it just simply doesn't work.
There's probably some additional issues in regards to how the
iframe feature works, but I think this is a sufficient fix
for now.
Bug: 56405
Change-Id: I70a54ef173f185e2cfd74f40982dc12f2af85c9f
---
M TimedMediaTransformOutput.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Mdale: Verified; Looks good to me, approved
diff --git a/TimedMediaTransformOutput.php b/TimedMediaTransformOutput.php
index 828745a..a82772e 100644
--- a/TimedMediaTransformOutput.php
+++ b/TimedMediaTransformOutput.php
@@ -132,7 +132,9 @@
// Check if the video is too small to play inline ( instead do
a pop-up dialog )
- if( $this->getPlayerWidth() <= $wgMinimumVideoPlayerSize &&
$this->isVideo ){
+ // If we're filling the window (e.g. during an iframe embed)
one probably doesn't want the pop up.
+ // Also the pop up is broken in that case.
+ if( $this->getPlayerWidth() <= $wgMinimumVideoPlayerSize &&
$this->isVideo && !$this->fillwindow ){
$res = $this->getImagePopUp();
} else {
$res = $this->getHtmlMediaTagOutput();
--
To view, visit https://gerrit.wikimedia.org/r/93999
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I70a54ef173f185e2cfd74f40982dc12f2af85c9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff <bawolff...@gmail.com>
Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: MarkTraceur <mtrac...@member.fsf.org>
Gerrit-Reviewer: Mdale <md...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
