[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix processing ref in ref

2017-10-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386764 )

Change subject: Fix processing ref in ref
..


Fix processing ref in ref

 * Follow up to d47d5abb

 * Fixes the regression found in rt:

   node bin/roundtrip-test.js --domain ru.wikipedia.org "Феодосия"

 * Simple test case (do we really not have one!?):

   test haha{{#tag:ref|ok}}

Change-Id: Ie0a53a8e885a6d94769034cce4ef432773635842
---
M lib/ext/Cite/index.js
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/lib/ext/Cite/index.js b/lib/ext/Cite/index.js
index 0192263..21a31a4 100644
--- a/lib/ext/Cite/index.js
+++ b/lib/ext/Cite/index.js
@@ -427,7 +427,10 @@
var body;
 
if (dp.hasRefInRef) {
-   _processRefs(cite, refsData, env.fragmentMap.get(content));
+   var c = env.fragmentMap.get(content);
+   DU.visitDOM(c, DU.loadDataAttribs);
+   _processRefs(cite, refsData, c);
+   DU.visitDOM(c, DU.storeDataAttribs);
}
 
if (content) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0a53a8e885a6d94769034cce4ef432773635842
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Arlolra 
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

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fix processing ref in ref

2017-10-26 Thread Arlolra (Code Review) 
Arlolra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/386764 )

Change subject: Fix processing ref in ref
..

Fix processing ref in ref

 * Follow up to d47d5abb

 * Fixes the regression found in rt:

   node bin/roundtrip-test.js --domain ru.wikipedia.org "Феодосия"

 * Simple test case (do we really not have one!?):

   test haha{{#tag:ref|ok}}

Change-Id: Ie0a53a8e885a6d94769034cce4ef432773635842
---
M lib/ext/Cite/index.js
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/64/386764/1

diff --git a/lib/ext/Cite/index.js b/lib/ext/Cite/index.js
index 0192263..5ae6236 100644
--- a/lib/ext/Cite/index.js
+++ b/lib/ext/Cite/index.js
@@ -417,7 +417,7 @@
var refName = dp.name;
var about = node.getAttribute("about");
var ref = refsData.add(env, group, refName, about, nestedInReferences);
-   var nodeType = (node.getAttribute("typeof") || 
'').replace(/mw:Extension\/ref\/Marker/, '');
+   var nodeType = (node.getAttribute("typeof") || '').replace(/ 
mw:Extension\/ref\/Marker/, '');
 
// Add ref-index linkback
var doc = node.ownerDocument;
@@ -427,7 +427,10 @@
var body;
 
if (dp.hasRefInRef) {
-   _processRefs(cite, refsData, env.fragmentMap.get(content));
+   var c = env.fragmentMap.get(content);
+   DU.visitDOM(c, DU.loadDataAttribs);
+   _processRefs(cite, refsData, c);
+   DU.visitDOM(c, DU.storeDataAttribs);
}
 
if (content) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0a53a8e885a6d94769034cce4ef432773635842
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits