wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-25 06:46:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Strip trailing newlines from included templates

Browse source
This commit is contained in:
Gabriel Wicke 2012-02-13 14:17:03 +00:00
parent 025f9cddb3
commit 0b40741e1c
Notes: Gabriel Wicke 2012-02-27 16:40:01 +00:00 
https://mediawiki.org/wiki/Special:Code/MediaWiki/111371
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/parser/ext.core.TemplateHandler.js
View file

@ -279,10 +279,15 @@ TemplateHandler.prototype._onEnd = function( tplExpandData, token ) {
this.manager.env.dp( 'TemplateHandler._onEnd' + JSON.stringify( tplExpandData.resultTokens ) );
tplExpandData.expandDone = true;
var res = tplExpandData.resultTokens;
// Remove 'end' token from end
if ( res.length && res[res.length - 1].type === 'END' ) {
this.manager.env.dp( 'TemplateHandler, stripping end ' );
// Strip 'end' tokens and trailing newlines
var l = res[res.length - 1];
while ( res.length &&
( l.type === 'END' || l.constructor === NlTk )
)
{
this.manager.env.dp( 'TemplateHandler, stripping end or whitespace tokens' );
res.pop();
l = res[res.length - 1];
}
// Could also encapsulate the template tokens here, if that turns out