jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/376752 )
Change subject: T173061: Caption splitting on pipe entity
..
T173061: Caption splitting on pipe entity
Change-Id: I03585a3b2688974256bd0f6c84edff70417dbab8
---
M lib/wt2html/tt/LinkHandler.js
M tests/parserTests.txt
2 files changed, 21 insertions(+), 1 deletion(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/wt2html/tt/LinkHandler.js b/lib/wt2html/tt/LinkHandler.js
index 50dd701..554f5f4 100644
--- a/lib/wt2html/tt/LinkHandler.js
+++ b/lib/wt2html/tt/LinkHandler.js
@@ -952,6 +952,12 @@
// if this is a nowiki, we must be in a caption
return null;
}
+ // Similar to Util.tokensToString()'s includeEntities
+ if (Util.isEntitySpanToken(currentToken)) {
+ resultStr += currentToken.dataAttribs.src;
+ skipToEndOf = 'span';
+ continue;
+ }
if (currentToken.name === 'a') {
if (optInfo === undefined) {
optInfo = getOptionInfo(prefix +
resultStr, env);
@@ -1623,7 +1629,7 @@
if (Array.isArray(origOptSrc) && origOptSrc.length === 1) {
origOptSrc = origOptSrc[0];
}
- oText = Util.tokensToString(oContent.v, true);
+ oText = Util.tokensToString(oContent.v, true, {
includeEntities: true });
if (oText.constructor !== String) {
// Might be that this is a valid option whose value is
just
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 0e4092e..2c8ee4e 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -14246,6 +14246,20 @@
!! end
!! test
+Image caption with pipe entity
+!! wikitext
+[[File:Foobar.jpg|thumb|one two]]
+[[File:Foobar.jpg|thumb|one ''two'' three]]
+!! html/php
+http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg;
width="180" height="20" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" />
one two
+http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg;
width="180" height="20" class="thumbimage"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" />
one two
three
+
+!! html/parsoid
+one |
two
+one two | three
+!! end
+
+!! test
Allow empty links in image captions (T62753)
!! options
thumbsize=220
--
To view, visit https://gerrit.wikimedia.org/r/376752
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I03585a3b2688974256bd0f6c84edff70417dbab8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: C. Scott Ananian
Gerrit-Reviewer: Subramanya Sastry
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
