jenkins-bot has submitted this change and it was merged.
Change subject: GUI: Don't set format: null when outputting data
......................................................................
GUI: Don't set format: null when outputting data
Bug: T131972
Change-Id: Ifa34049be9a04da9b5e6d95e22f3d393ebf562b6
---
M modules/ext.templateDataGenerator.data.js
M tests/ext.templateData.tests.js
2 files changed, 7 insertions(+), 5 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.templateDataGenerator.data.js
b/modules/ext.templateDataGenerator.data.js
index 31fc4b2..57de7d1 100644
--- a/modules/ext.templateDataGenerator.data.js
+++ b/modules/ext.templateDataGenerator.data.js
@@ -895,7 +895,11 @@
}
// Format
- result.format = this.format;
+ if ( this.format === null ) {
+ delete result.format;
+ } else {
+ result.format = this.format;
+ }
// Attach sets as-is for now
// TODO: Work properly with sets
diff --git a/tests/ext.templateData.tests.js b/tests/ext.templateData.tests.js
index abf38b1..196f792 100644
--- a/tests/ext.templateData.tests.js
+++ b/tests/ext.templateData.tests.js
@@ -141,8 +141,7 @@
'day'
]
}
- ],
- format: null
+ ]
};
finalJson.description[ currLanguage ] = 'Label unsigned comments in a
conversation.';
@@ -628,8 +627,7 @@
' "params": {}\n' +
'}</templatedata>',
simpleTemplateDataDefaultFormat = {
- params: {},
- format: null
+ params: {}
};
QUnit.expect( 1 );
--
To view, visit https://gerrit.wikimedia.org/r/282075
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa34049be9a04da9b5e6d95e22f3d393ebf562b6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
