C. Scott Ananian has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/356479 )

Change subject: Use wikilinkHandler to escape wikilink fragments.
......................................................................

Use wikilinkHandler to escape wikilink fragments.

Change-Id: Ic8a5bf50dd9087d7c3ed717016a7df626a9c5ccb
---
M lib/html2wt/LinkHandler.js
1 file changed, 11 insertions(+), 5 deletions(-)


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

diff --git a/lib/html2wt/LinkHandler.js b/lib/html2wt/LinkHandler.js
index b2db533..e5e08bf 100644
--- a/lib/html2wt/LinkHandler.js
+++ b/lib/html2wt/LinkHandler.js
@@ -652,16 +652,22 @@
                } else {
                        // serialize as auto-numbered external link
                        // [http://example.com]
-                       var linktext, Construct;
+                       var linktext;
                        // If it's just anchor text, serialize as an internal 
link.
                        if (/^#/.test(urlStr)) {
-                               Construct = WikiLinkText;
-                               linktext = '[[' + urlStr + (contentStr ? '|' + 
contentStr : '') + ']]';
+                               // Reserialize content using wikilinkHandler
+                               return state.serializeLinkChildrenToString(
+                                       node,
+                                       
state.serializer.wteHandlers.wikilinkHandler
+                               ).then(function(ncontentStr) {
+                                       linktext = '[[' + urlStr + (ncontentStr 
? '|' + ncontentStr : '') + ']]';
+                                       state.emitChunk(new 
WikiLinkText(linktext, node, wiki, linkData.type));
+                                       return;
+                               });
                        } else {
-                               Construct = ExtLinkText;
                                linktext = '[' + urlStr + (contentStr ? ' ' + 
contentStr : '') + ']';
+                               state.emitChunk(new ExtLinkText(linktext, node, 
wiki, linkData.type), node);
                        }
-                       state.emitChunk(new Construct(linktext, node, wiki, 
linkData.type), node);
                        return;
                }
        });

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8a5bf50dd9087d7c3ed717016a7df626a9c5ccb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian <canan...@wikimedia.org>

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

Reply via email to