Arlolra has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334186 )
Change subject: Set src as the original value when using title as href
......................................................................
Set src as the original value when using title as href
* Further regression fixing following fa6906a and 643d5392
Change-Id: Ifdfb167859a0c96837076d411feea8ced9d57912
---
M lib/wt2html/tt/LinkHandler.js
M tests/parserTests.txt
2 files changed, 13 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/86/334186/1
diff --git a/lib/wt2html/tt/LinkHandler.js b/lib/wt2html/tt/LinkHandler.js
index 5f02fc2..9ae4be4 100644
--- a/lib/wt2html/tt/LinkHandler.js
+++ b/lib/wt2html/tt/LinkHandler.js
@@ -1046,8 +1046,8 @@
if (!/\bmw:Error\b/.test(rdfaType)) {
// Add (read-only) information about original file size (T64881)
- img.addAttribute('data-file-width', info.width);
- img.addAttribute('data-file-height', info.height);
+ img.addAttribute('data-file-width', info.width.toString());
+ img.addAttribute('data-file-height', info.height.toString());
img.addAttribute('data-file-type',
info.mediatype.toLowerCase());
}
@@ -1063,7 +1063,7 @@
innerContain.addNormalizedAttribute('href', this.env.makeLink(link),
opts.link.src);
} else {
// Treat same as if opts.link weren't
present
-
innerContain.addNormalizedAttribute('href', this.env.makeLink(opts.title.v));
+
innerContain.addNormalizedAttribute('href', this.env.makeLink(opts.title.v),
opts.title.src);
// but maybe consider it a caption
var pos =
token.dataAttribs.optList.reduce(function(prv, cur, ind) {
return cur.ck === 'link' ? ind
: prv;
@@ -1076,7 +1076,7 @@
}
// No href if link= was specified
} else {
- innerContain.addNormalizedAttribute('href',
this.env.makeLink(opts.title.v));
+ innerContain.addNormalizedAttribute('href',
this.env.makeLink(opts.title.v), opts.title.src);
}
}
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 52209d2..9c1ccf5 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -7856,6 +7856,15 @@
!! end
!! test
+File containing double quotes and spaces
+!! options
+parsoid=wt2wt
+!! wikitext
+[[File:Cool "Gator".png]]
+!! html/parsoid
+!! end
+
+!! test
Link containing double-single-quotes '' in text (bug 4598 sanity check)
!! wikitext
Some [[Link|pretty ''italics'' and stuff]]!
--
To view, visit https://gerrit.wikimedia.org/r/334186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifdfb167859a0c96837076d411feea8ced9d57912
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <abrea...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
