wikimedia/mediawiki-extensions-TemplateData
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/TemplateData synced 2024-09-24 18:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Avoid adding an extra blank line before <noinclude>"

Browse source
This commit is contained in:
jenkins-bot 2016-01-12 20:00:45 +00:00 committed by Gerrit Code Review
parent 11f874975e 334b9661b0
commit 89b3889005
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/ext.templateDataGenerator.ui.js
View file

@ -158,16 +158,19 @@
'<templatedata>\n' + newTemplateData + '\n</templatedata>'
);
} else {
if ( isPageSubLevel ) {
// Add the <templatedata>
finalOutput = fullWikitext + '\n<templatedata>\n' +
finalOutput = fullWikitext;
if ( fullWikitext.substr( -1 ) !== '\n' ) {
finalOutput += '\n';
}
if ( !isPageSubLevel ) {
finalOutput += '<noinclude>\n';
}
finalOutput += '<templatedata>\n' +
newTemplateData +
'\n</templatedata>\n';
} else {
// If we are not in a subpage, add <noinclude> tags
finalOutput = fullWikitext + '\n<noinclude>\n<templatedata>\n' +
newTemplateData +
'\n</templatedata>\n</noinclude>\n';
if ( !isPageSubLevel ) {
finalOutput += '</noinclude>\n';
}
}
return finalOutput;