wikimedia/mediawiki-extensions-TemplateData
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/TemplateData synced 2024-11-27 17:20:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "GUI: Don't set format: null when outputting data"

Browse source
This commit is contained in:
jenkins-bot 2016-04-08 16:24:39 +00:00 committed by Gerrit Code Review
parent ba9c9e7a77 040c615165
commit 74f13b9914
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/ext.templateDataGenerator.data.js
View file

@ -895,7 +895,11 @@ mw.TemplateData.Model.prototype.outputTemplateData = function () {
} }
// Format // Format
result.format = this.format; if ( this.format === null ) {
delete result.format;
} else {
result.format = this.format;
}
// Attach sets as-is for now // Attach sets as-is for now
// TODO: Work properly with sets // TODO: Work properly with sets

6
tests/ext.templateData.tests.js
View file

@ -141,8 +141,7 @@
'day' 'day'
] ]
} }
], ]
format: null
}; };
finalJson.description[ currLanguage ] = 'Label unsigned comments in a conversation.'; finalJson.description[ currLanguage ] = 'Label unsigned comments in a conversation.';
@ -628,8 +627,7 @@
' "params": {}\n' + ' "params": {}\n' +
'}</templatedata>', '}</templatedata>',
simpleTemplateDataDefaultFormat = { simpleTemplateDataDefaultFormat = {
params: {}, params: {}
format: null
}; };
QUnit.expect( 1 ); QUnit.expect( 1 );