GWicke has submitted this change and it was merged. Change subject: Record correct normalized href attribute for extlinks. ......................................................................
Record correct normalized href attribute for extlinks. * Fixes RTing of snippets like [http://foo.com?a=a&035;b bar] * Also got rid of stale dataAttribs.gc attribute from tokenizer. * 3 more wt2wt tests green. * Fixes RTing of en:Maverick House Publishers. Change-Id: Ie3aba841405717a22bffca9448ae58568a53bdd7 --- M js/lib/ext.core.LinkHandler.js M js/lib/pegTokenizer.pegjs.txt 2 files changed, 5 insertions(+), 4 deletions(-) Approvals: MarkTraceur: Looks good to me, but someone else must approve GWicke: Verified; Looks good to me, approved diff --git a/js/lib/ext.core.LinkHandler.js b/js/lib/ext.core.LinkHandler.js index 72bac31..eee9876 100644 --- a/js/lib/ext.core.LinkHandler.js +++ b/js/lib/ext.core.LinkHandler.js @@ -839,7 +839,11 @@ href = Sanitizer._stripIDNs( href ); } - aStart.addNormalizedAttribute( 'href', href, origHref ); + // targetOff covers all spaces before content + // and we need src without those spaces. + var tsr0 = dataAttribs.tsr[0] + 1, + tsr1 = dataAttribs.targetOff - (token.getAttribute('spaces') || '').length; + aStart.addNormalizedAttribute( 'href', href, env.page.src.substring(tsr0, tsr1) ); cb( { tokens: [aStart].concat(content, [new EndTagTk('a')]) } ); diff --git a/js/lib/pegTokenizer.pegjs.txt b/js/lib/pegTokenizer.pegjs.txt index 2570b62..cf8e24a 100644 --- a/js/lib/pegTokenizer.pegjs.txt +++ b/js/lib/pegTokenizer.pegjs.txt @@ -743,9 +743,6 @@ //} //console.warn( 'extlink text: ' + pp( text ) ); var dataAttribs = { targetOff: targetOff }; - if ( content === '' ) { - dataAttribs.gc = 1; - } dataAttribs.tsr = [pos0, pos]; return [ new SelfclosingTagTk( 'extlink', [ -- To view, visit https://gerrit.wikimedia.org/r/51600 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie3aba841405717a22bffca9448ae58568a53bdd7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Parsoid Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry <[email protected]> Gerrit-Reviewer: GWicke <[email protected]> Gerrit-Reviewer: MarkTraceur <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
