Subramanya Sastry has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/351874 )
Change subject: Tweak setting / retrieving of shadow info for [[Media:..]]
wikitext
......................................................................
Tweak setting / retrieving of shadow info for [[Media:..]] wikitext
* href for a-tags is derived from the filename and so target.value
should also be derived from the filename.
* Since setShadowInfo has the smarts to set/ignore shadows for when
they are identical, get rid of the conditional in wt2html mode.
Change-Id: I35bcb309346a672b8d636de9defef33c2e3eee18
---
M lib/html2wt/LinkHandler.js
M lib/wt2html/tt/LinkHandler.js
2 files changed, 11 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/74/351874/1
diff --git a/lib/html2wt/LinkHandler.js b/lib/html2wt/LinkHandler.js
index 1130fd1..90738ad 100644
--- a/lib/html2wt/LinkHandler.js
+++ b/lib/html2wt/LinkHandler.js
@@ -238,8 +238,14 @@
}
// Unless edited, get original shadowed info for
'fileName'
+ // and update rtData.href. href/target is derived from
the filename
var fnInfo = DU.getShadowInfo(node, 'fileName',
rtData.href.replace(/.*\//, ''));
- rtData.target.value = rtData.href = mediaPrefix + ":" +
fnInfo.value;
+ rtData.target = {
+ value: mediaPrefix + ":" + fnInfo.value,
+ fromsrc: fnInfo.fromsrc,
+ modified: fnInfo.modified,
+ };
+ rtData.href = rtData.target.value;
}
return rtData;
diff --git a/lib/wt2html/tt/LinkHandler.js b/lib/wt2html/tt/LinkHandler.js
index d3b53cb..e253ed8 100644
--- a/lib/wt2html/tt/LinkHandler.js
+++ b/lib/wt2html/tt/LinkHandler.js
@@ -1848,13 +1848,11 @@
link.addAttribute('data-mw', JSON.stringify(dataMw));
}
- // Record the localized version of the namespace
+ // Record shadow attribute info:
+ // - original namespace and localized version
+ // - original filename and filename used in href
link.setShadowInfo('namespace',
title.getNamespace().getNormalizedText(), nsText);
-
- // Record the original file name, if necessary
- if (imgHrefFileName !== fileName) {
- link.setShadowInfo('fileName', imgHrefFileName, fileName);
- }
+ link.setShadowInfo('fileName', imgHrefFileName, fileName);
var content = token.getAttribute('mw:maybeContent') ||
token.getAttribute('href');
cb({ tokens: [ link, content, new EndTagTk('a') ] });
--
To view, visit https://gerrit.wikimedia.org/r/351874
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I35bcb309346a672b8d636de9defef33c2e3eee18
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
