MarkTraceur has submitted this change and it was merged.

Change subject: Bug 48477: Fix new wiki link serialization
......................................................................


Bug 48477: Fix new wiki link serialization

b5beb51e started to modify the dsr value of passed-in HTML nodes with this
line:

dp.dsr = dp.dsr || [];

This broke modification detection in DOMUtils.getAttributeShadowInfo, which
relied on Object.keys(dp) being empty. This lead to new links being treated as
if they were unmodified, resulting in bug 48477:

echo '<a href="Foo" rel="mw:WikiLink">foo</a>' | node parse --html2wt
[[Foo]]

This patch changes the 'new content' detection in
DOMUtils.getAttributeShadowInfo to directly check for the presence of the
data-parsoid attribute, which is not affected by the dsr initialization
introduced in b5beb51e.

Bug: 48477
Change-Id: I4d47e69a87dd957f0a6059d935d2fdee9d21cdfd
---
M js/lib/mediawiki.DOMUtils.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  MarkTraceur: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/js/lib/mediawiki.DOMUtils.js b/js/lib/mediawiki.DOMUtils.js
index 9d5c4b3..bbe75a9 100644
--- a/js/lib/mediawiki.DOMUtils.js
+++ b/js/lib/mediawiki.DOMUtils.js
@@ -125,7 +125,7 @@
                        return {
                                value: curVal,
                                // Mark as modified if a new element
-                               modified: Object.keys(dp).length === 0,
+                               modified: !node.hasAttribute('data-parsoid'),
                                fromsrc: false
                        };
                } else if ( dp.a[name] !== curVal ||

-- 
To view, visit https://gerrit.wikimedia.org/r/63879
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d47e69a87dd957f0a6059d935d2fdee9d21cdfd
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to