Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/279287
Change subject: Update parser test for core change ...................................................................... Update parser test for core change Html::element() now outputs '<tag/>' instead of '<tag />'. (if $wgWellFormedXml is false it's simply '<tag>'). Change-Id: I7b2a19af0938222b957c72e49c8d326ada78b23f Depends-On: I85a5a59fd0955c1a112e8b24b933f0d9e983a156 --- M tests/parserTests.txt 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler refs/changes/87/279287/1 diff --git a/tests/parserTests.txt b/tests/parserTests.txt index 46db866..5027e11 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -7,7 +7,7 @@ !! html+tidy <div class="mediaContainer" style="width:320px"><video id="mwe_player_0" poster="http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg"; controls="" preload="none" style="width:320px;height:240px" class="kskin" data-durationhint="4.3666666666667" data-startoffset="0" data-mwtitle="Video.ogv" data-mwprovider="local"> -<source src="http://example.com/images/0/00/Video.ogv"; type="video/ogg; codecs="theora"" data-title="Original Ogg file, 320 × 240 (590 kbps)" data-shorttitle="Ogg source" data-width="320" data-height="240" data-bandwidth="590013" data-framerate="30" />Sorry, your browser either has JavaScript disabled or does not have any supported player.<br /> +<source src="http://example.com/images/0/00/Video.ogv"; type="video/ogg; codecs="theora"" data-title="Original Ogg file, 320 × 240 (590 kbps)" data-shorttitle="Ogg source" data-width="320" data-height="240" data-bandwidth="590013" data-framerate="30"/>Sorry, your browser either has JavaScript disabled or does not have any supported player.<br /> You can <a href="http://example.com/images/0/00/Video.ogv";>download the clip</a> or <a href="https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download";>download a player</a> to play the clip in your browser.</video></div> !!end @@ -16,12 +16,12 @@ !! wikitext [[File:Video.ogv|thumb]] !! html -<div class="thumb tright"><div class="thumbinner" style="width:182px;"><div id="mwe_player_4" class="PopUpMediaTransform" style="width:180px;" videopayload="<div class="mediaContainer" style="width:320px"><video id="mwe_player_5" poster="http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg" controls="" preload="none" autoplay="" style="width:320px;height:240px" class="kskin" data-durationhint="4.3666666666667" data-startoffset="0" data-mwtitle="Video.ogv" data-mwprovider="local"><source src="http://example.com/images/0/00/Video.ogv" type="video/ogg; codecs=&quot;theora&quot;" data-title="Original Ogg file, 320 × 240 (590 kbps)" data-shorttitle="Ogg source" data-width="320" data-height="240" data-bandwidth="590013" data-framerate="30" />Sorry, your browser either has JavaScript disabled or does not have any supported player.<br /> You can <a href="http://example.com/images/0/00/Video.ogv">download the clip</a> or <a href="https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download">download a player</a> to play the clip in your browser.</video></div>"><img alt="File:Video.ogv" style="width:180px;height:135px" src="http://example.com/images/thumb/0/00/Video.ogv/180px--Video.ogv.jpg";></img><a href="http://example.com/images/0/00/Video.ogv"; title="Play media" target="new"><span class="play-btn-large"><span class="mw-tmh-playtext">Play media</span></span></a></div> <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Video.ogv" class="internal" title="Enlarge"></a></div></div></div></div> +<div class="thumb tright"><div class="thumbinner" style="width:182px;"><div id="mwe_player_4" class="PopUpMediaTransform" style="width:180px;" videopayload="<div class="mediaContainer" style="width:320px"><video id="mwe_player_5" poster="http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg" controls="" preload="none" autoplay="" style="width:320px;height:240px" class="kskin" data-durationhint="4.3666666666667" data-startoffset="0" data-mwtitle="Video.ogv" data-mwprovider="local"><source src="http://example.com/images/0/00/Video.ogv" type="video/ogg; codecs=&quot;theora&quot;" data-title="Original Ogg file, 320 × 240 (590 kbps)" data-shorttitle="Ogg source" data-width="320" data-height="240" data-bandwidth="590013" data-framerate="30"/>Sorry, your browser either has JavaScript disabled or does not have any supported player.<br /> You can <a href="http://example.com/images/0/00/Video.ogv">download the clip</a> or <a href="https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download">download a player</a> to play the clip in your browser.</video></div>"><img alt="File:Video.ogv" style="width:180px;height:135px" src="http://example.com/images/thumb/0/00/Video.ogv/180px--Video.ogv.jpg";></img><a href="http://example.com/images/0/00/Video.ogv"; title="Play media" target="new"><span class="play-btn-large"><span class="mw-tmh-playtext">Play media</span></span></a></div> <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Video.ogv" class="internal" title="Enlarge"></a></div></div></div></div> !! html+tidy <div class="thumb tright"> <div class="thumbinner" style="width:182px;"> -<div id="mwe_player_2" class="PopUpMediaTransform" style="width:180px;" videopayload="<div class="mediaContainer" style="width:320px"><video id="mwe_player_3" poster="http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg" controls="" preload="none" autoplay="" style="width:320px;height:240px" class="kskin" data-durationhint="4.3666666666667" data-startoffset="0" data-mwtitle="Video.ogv" data-mwprovider="local"><source src="http://example.com/images/0/00/Video.ogv" type="video/ogg; codecs=&quot;theora&quot;" data-title="Original Ogg file, 320 × 240 (590 kbps)" data-shorttitle="Ogg source" data-width="320" data-height="240" data-bandwidth="590013" data-framerate="30" />Sorry, your browser either has JavaScript disabled or does not have any supported player.<br /> +<div id="mwe_player_2" class="PopUpMediaTransform" style="width:180px;" videopayload="<div class="mediaContainer" style="width:320px"><video id="mwe_player_3" poster="http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg" controls="" preload="none" autoplay="" style="width:320px;height:240px" class="kskin" data-durationhint="4.3666666666667" data-startoffset="0" data-mwtitle="Video.ogv" data-mwprovider="local"><source src="http://example.com/images/0/00/Video.ogv" type="video/ogg; codecs=&quot;theora&quot;" data-title="Original Ogg file, 320 × 240 (590 kbps)" data-shorttitle="Ogg source" data-width="320" data-height="240" data-bandwidth="590013" data-framerate="30"/>Sorry, your browser either has JavaScript disabled or does not have any supported player.<br /> You can <a href="http://example.com/images/0/00/Video.ogv">download the clip</a> or <a href="https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download">download a player</a> to play the clip in your browser.</video></div>"><img alt="File:Video.ogv" style="width:180px;height:135px" src="http://example.com/images/thumb/0/00/Video.ogv/180px--Video.ogv.jpg"; /><a href="http://example.com/images/0/00/Video.ogv"; title="Play media" target="new"><span class="play-btn-large"><span class="mw-tmh-playtext">Play media</span></span></a></div> <div class="thumbcaption"> <div class="magnify"><a href="/wiki/File:Video.ogv" class="internal" title="Enlarge"></a></div> @@ -37,7 +37,7 @@ !! html <ul class="gallery mw-gallery-traditional"> <li class="gallerybox" style="width: 155px"><div style="width: 155px"> - <div class="thumb" style="width: 150px;"><div style="margin:30px auto;"><div id="mwe_player_6" class="PopUpMediaTransform" style="width:120px;" videopayload="<div class="mediaContainer" style="width:320px"><video id="mwe_player_7" poster="http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg" controls="" preload="none" autoplay="" style="width:320px;height:240px" class="kskin" data-durationhint="4.3666666666667" data-startoffset="0" data-mwtitle="Video.ogv" data-mwprovider="local"><source src="http://example.com/images/0/00/Video.ogv" type="video/ogg; codecs=&quot;theora&quot;" data-title="Original Ogg file, 320 × 240 (590 kbps)" data-shorttitle="Ogg source" data-width="320" data-height="240" data-bandwidth="590013" data-framerate="30" />Sorry, your browser either has JavaScript disabled or does not have any supported player.<br /> You can <a href="http://example.com/images/0/00/Video.ogv">download the clip</a> or <a href="https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download">download a player</a> to play the clip in your browser.</video></div>"><img alt="File:Video.ogv" style="width:120px;height:90px" src="http://example.com/images/thumb/0/00/Video.ogv/120px--Video.ogv.jpg";></img><a href="http://example.com/images/0/00/Video.ogv"; title="Play media" target="new"><span class="play-btn-large"><span class="mw-tmh-playtext">Play media</span></span></a></div></div></div> + <div class="thumb" style="width: 150px;"><div style="margin:30px auto;"><div id="mwe_player_6" class="PopUpMediaTransform" style="width:120px;" videopayload="<div class="mediaContainer" style="width:320px"><video id="mwe_player_7" poster="http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg" controls="" preload="none" autoplay="" style="width:320px;height:240px" class="kskin" data-durationhint="4.3666666666667" data-startoffset="0" data-mwtitle="Video.ogv" data-mwprovider="local"><source src="http://example.com/images/0/00/Video.ogv" type="video/ogg; codecs=&quot;theora&quot;" data-title="Original Ogg file, 320 × 240 (590 kbps)" data-shorttitle="Ogg source" data-width="320" data-height="240" data-bandwidth="590013" data-framerate="30"/>Sorry, your browser either has JavaScript disabled or does not have any supported player.<br /> You can <a href="http://example.com/images/0/00/Video.ogv">download the clip</a> or <a href="https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download">download a player</a> to play the clip in your browser.</video></div>"><img alt="File:Video.ogv" style="width:120px;height:90px" src="http://example.com/images/thumb/0/00/Video.ogv/120px--Video.ogv.jpg";></img><a href="http://example.com/images/0/00/Video.ogv"; title="Play media" target="new"><span class="play-btn-large"><span class="mw-tmh-playtext">Play media</span></span></a></div></div></div> <div class="gallerytext"> </div> </div></li> @@ -45,12 +45,12 @@ !!end -!! test +!! test Video with thumbtime=1:25 !! wikitext [[File:Video.ogv|thumbtime=1:25]] !! html -<div class="mediaContainer" style="width:320px"><video id="mwe_player_8" poster="http://example.com/images/thumb/0/00/Video.ogv/320px-seek%3D3.3666666666667-Video.ogv.jpg"; controls="" preload="none" style="width:320px;height:240px" class="kskin" data-durationhint="4.3666666666667" data-startoffset="0" data-mwtitle="Video.ogv" data-mwprovider="local"><source src="http://example.com/images/0/00/Video.ogv"; type="video/ogg; codecs="theora"" data-title="Original Ogg file, 320 × 240 (590 kbps)" data-shorttitle="Ogg source" data-width="320" data-height="240" data-bandwidth="590013" data-framerate="30" />Sorry, your browser either has JavaScript disabled or does not have any supported player.<br /> You can <a href="http://example.com/images/0/00/Video.ogv";>download the clip</a> or <a href="https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download";>download a player</a> to play the clip in your browser.</video></div> +<div class="mediaContainer" style="width:320px"><video id="mwe_player_8" poster="http://example.com/images/thumb/0/00/Video.ogv/320px-seek%3D3.3666666666667-Video.ogv.jpg"; controls="" preload="none" style="width:320px;height:240px" class="kskin" data-durationhint="4.3666666666667" data-startoffset="0" data-mwtitle="Video.ogv" data-mwprovider="local"><source src="http://example.com/images/0/00/Video.ogv"; type="video/ogg; codecs="theora"" data-title="Original Ogg file, 320 × 240 (590 kbps)" data-shorttitle="Ogg source" data-width="320" data-height="240" data-bandwidth="590013" data-framerate="30"/>Sorry, your browser either has JavaScript disabled or does not have any supported player.<br/> You can <a href="http://example.com/images/0/00/Video.ogv";>download the clip</a> or <a href="https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download";>download a player</a> to play the clip in your browser.</video></div> !! end @@ -59,7 +59,7 @@ !! wikitext [[File:Video.ogv|start=1:25]] !! html -<div class="mediaContainer" style="width:320px"><video id="mwe_player_9" poster="http://example.com/images/thumb/0/00/Video.ogv/320px-seek%3D3.3666666666667-Video.ogv.jpg"; controls="" preload="none" style="width:320px;height:240px" class="kskin" data-durationhint="4.3666666666667" data-startoffset="0" data-mwtitle="Video.ogv" data-mwprovider="local"><source src="http://example.com/images/0/00/Video.ogv#t=0:0:3.-0.00033333333329999"; type="video/ogg; codecs="theora"" data-title="Original Ogg file, 320 × 240 (590 kbps)" data-shorttitle="Ogg source" data-width="320" data-height="240" data-bandwidth="590013" data-framerate="30" />Sorry, your browser either has JavaScript disabled or does not have any supported player.<br /> You can <a href="http://example.com/images/0/00/Video.ogv#t=0:0:3.-0.00033333333329999";>download the clip</a> or <a href="https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download";>download a player</a> to play the clip in your browser.</video></div> +<div class="mediaContainer" style="width:320px"><video id="mwe_player_9" poster="http://example.com/images/thumb/0/00/Video.ogv/320px-seek%3D3.3666666666667-Video.ogv.jpg"; controls="" preload="none" style="width:320px;height:240px" class="kskin" data-durationhint="4.3666666666667" data-startoffset="0" data-mwtitle="Video.ogv" data-mwprovider="local"><source src="http://example.com/images/0/00/Video.ogv#t=0:0:3.-0.00033333333329999"; type="video/ogg; codecs="theora"" data-title="Original Ogg file, 320 × 240 (590 kbps)" data-shorttitle="Ogg source" data-width="320" data-height="240" data-bandwidth="590013" data-framerate="30"/>Sorry, your browser either has JavaScript disabled or does not have any supported player.<br/> You can <a href="http://example.com/images/0/00/Video.ogv#t=0:0:3.-0.00033333333329999";>download the clip</a> or <a href="https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download";>download a player</a> to play the clip in your browser.</video></div> !! end @@ -68,7 +68,7 @@ !! wikitext [[File:Video.ogv|start=1:25|end=1:35]] !! html -<div class="mediaContainer" style="width:320px"><video id="mwe_player_10" poster="http://example.com/images/thumb/0/00/Video.ogv/320px-seek%3D3.3666666666667-Video.ogv.jpg"; controls="" preload="none" style="width:320px;height:240px" class="kskin" data-durationhint="4.3666666666667" data-startoffset="0" data-mwtitle="Video.ogv" data-mwprovider="local"><source src="http://example.com/images/0/00/Video.ogv#t=0:0:3.-0.00033333333329999,0:0:3.-0.00033333333329999"; type="video/ogg; codecs="theora"" data-title="Original Ogg file, 320 × 240 (590 kbps)" data-shorttitle="Ogg source" data-width="320" data-height="240" data-bandwidth="590013" data-framerate="30" />Sorry, your browser either has JavaScript disabled or does not have any supported player.<br /> You can <a href="http://example.com/images/0/00/Video.ogv#t=0:0:3.-0.00033333333329999,0:0:3.-0.00033333333329999";>download the clip</a> or <a href="https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download";>download a player</a> to play the clip in your browser.</video></div> +<div class="mediaContainer" style="width:320px"><video id="mwe_player_10" poster="http://example.com/images/thumb/0/00/Video.ogv/320px-seek%3D3.3666666666667-Video.ogv.jpg"; controls="" preload="none" style="width:320px;height:240px" class="kskin" data-durationhint="4.3666666666667" data-startoffset="0" data-mwtitle="Video.ogv" data-mwprovider="local"><source src="http://example.com/images/0/00/Video.ogv#t=0:0:3.-0.00033333333329999,0:0:3.-0.00033333333329999"; type="video/ogg; codecs="theora"" data-title="Original Ogg file, 320 × 240 (590 kbps)" data-shorttitle="Ogg source" data-width="320" data-height="240" data-bandwidth="590013" data-framerate="30"/>Sorry, your browser either has JavaScript disabled or does not have any supported player.<br/> You can <a href="http://example.com/images/0/00/Video.ogv#t=0:0:3.-0.00033333333329999,0:0:3.-0.00033333333329999";>download the clip</a> or <a href="https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download";>download a player</a> to play the clip in your browser.</video></div> !! end @@ -77,7 +77,7 @@ !! wikitext [[File:Video.ogv|alt=Test]] !! html -<div class="mediaContainer" style="width:320px"><video id="mwe_player_11" poster="http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg"; controls="" preload="none" style="width:320px;height:240px" class="kskin" data-durationhint="4.3666666666667" data-startoffset="0" data-mwtitle="Video.ogv" data-mwprovider="local"><source src="http://example.com/images/0/00/Video.ogv"; type="video/ogg; codecs="theora"" data-title="Original Ogg file, 320 × 240 (590 kbps)" data-shorttitle="Ogg source" data-width="320" data-height="240" data-bandwidth="590013" data-framerate="30" />Sorry, your browser either has JavaScript disabled or does not have any supported player.<br /> You can <a href="http://example.com/images/0/00/Video.ogv";>download the clip</a> or <a href="https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download";>download a player</a> to play the clip in your browser.</video></div> +<div class="mediaContainer" style="width:320px"><video id="mwe_player_11" poster="http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg"; controls="" preload="none" style="width:320px;height:240px" class="kskin" data-durationhint="4.3666666666667" data-startoffset="0" data-mwtitle="Video.ogv" data-mwprovider="local"><source src="http://example.com/images/0/00/Video.ogv"; type="video/ogg; codecs="theora"" data-title="Original Ogg file, 320 × 240 (590 kbps)" data-shorttitle="Ogg source" data-width="320" data-height="240" data-bandwidth="590013" data-framerate="30"/>Sorry, your browser either has JavaScript disabled or does not have any supported player.<br/> You can <a href="http://example.com/images/0/00/Video.ogv";>download the clip</a> or <a href="https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download";>download a player</a> to play the clip in your browser.</video></div> !! end @@ -86,7 +86,7 @@ !! wikitext [[File:Video.ogv|link=Example]] !! html -<div class="mediaContainer" style="width:320px"><video id="mwe_player_12" poster="http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg"; controls="" preload="none" style="width:320px;height:240px" class="kskin" data-durationhint="4.3666666666667" data-startoffset="0" data-mwtitle="Video.ogv" data-mwprovider="local"><source src="http://example.com/images/0/00/Video.ogv"; type="video/ogg; codecs="theora"" data-title="Original Ogg file, 320 × 240 (590 kbps)" data-shorttitle="Ogg source" data-width="320" data-height="240" data-bandwidth="590013" data-framerate="30" />Sorry, your browser either has JavaScript disabled or does not have any supported player.<br /> You can <a href="http://example.com/images/0/00/Video.ogv";>download the clip</a> or <a href="https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download";>download a player</a> to play the clip in your browser.</video></div> +<div class="mediaContainer" style="width:320px"><video id="mwe_player_12" poster="http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg"; controls="" preload="none" style="width:320px;height:240px" class="kskin" data-durationhint="4.3666666666667" data-startoffset="0" data-mwtitle="Video.ogv" data-mwprovider="local"><source src="http://example.com/images/0/00/Video.ogv"; type="video/ogg; codecs="theora"" data-title="Original Ogg file, 320 × 240 (590 kbps)" data-shorttitle="Ogg source" data-width="320" data-height="240" data-bandwidth="590013" data-framerate="30"/>Sorry, your browser either has JavaScript disabled or does not have any supported player.<br/> You can <a href="http://example.com/images/0/00/Video.ogv";>download the clip</a> or <a href="https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:TimedMediaHandler/Client_download";>download a player</a> to play the clip in your browser.</video></div> !! end -- To view, visit https://gerrit.wikimedia.org/r/279287 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b2a19af0938222b957c72e49c8d326ada78b23f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TimedMediaHandler Gerrit-Branch: master Gerrit-Owner: Krinkle <krinklem...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
![http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg"](http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg"){kind=link}
![http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg"](http://example.com/images/thumb/0/00/Video.ogv/320px--Video.ogv.jpg"){kind=link}
![http://example.com/images/thumb/0/00/Video.ogv/180px--Video.ogv.jpg"](http://example.com/images/thumb/0/00/Video.ogv/180px--Video.ogv.jpg"){kind=link}
![http://example.com/images/thumb/0/00/Video.ogv/120px--Video.ogv.jpg"](http://example.com/images/thumb/0/00/Video.ogv/120px--Video.ogv.jpg"){kind=link}
![http://example.com/images/thumb/0/00/Video.ogv/320px-seek%3D3.3666666666667-Video.ogv.jpg"](http://example.com/images/thumb/0/00/Video.ogv/320px-seek%3D3.3666666666667-Video.ogv.jpg"){kind=link}