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

Merge "Simplify some overly complex comparisons with undefined"

Browse source
This commit is contained in:
jenkins-bot 2022-12-16 22:51:30 +00:00 committed by Gerrit Code Review
parent b4c960287a 2d55ab3e68
commit 310bf46cf9
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/ext.templateDataGenerator.data/Model.js
View file

@ -614,7 +614,7 @@ Model.prototype.setTemplateParamOrder = function ( orderArray ) {
* @fires change * @fires change
*/ */
Model.prototype.setTemplateFormat = function ( format ) { Model.prototype.setTemplateFormat = function ( format ) {
format = format !== undefined ? format : null; format = format || null;
if ( this.format !== format ) { if ( this.format !== format ) {
this.format = format; this.format = format;
this.emit( 'change-format', format ); this.emit( 'change-format', format );

6
modules/ext.templateDataGenerator.editTemplatePage/Dialog.js
View file

@ -405,7 +405,7 @@ Dialog.prototype.onModelChangeDescription = function ( description ) {
*/ */
Dialog.prototype.onModelChangeMapInfo = function ( map ) { Dialog.prototype.onModelChangeMapInfo = function ( map ) {
var selectedItem = this.mapsGroup.findSelectedItem(); var selectedItem = this.mapsGroup.findSelectedItem();
map = map === undefined ? {} : map; map = map || {};
this.mapsCache = OO.copy( map ); this.mapsCache = OO.copy( map );
if ( selectedItem ) { if ( selectedItem ) {
this.templateMapsInput.setValue( this.stringifyObject( map[ selectedItem.label ] ) ); this.templateMapsInput.setValue( this.stringifyObject( map[ selectedItem.label ] ) );
@ -511,7 +511,7 @@ Dialog.prototype.onDescriptionInputChange = function ( value ) {
* @param {Object|undefined} mapsObject * @param {Object|undefined} mapsObject
*/ */
Dialog.prototype.populateMapsItems = function ( mapsObject ) { Dialog.prototype.populateMapsItems = function ( mapsObject ) {
mapsObject = mapsObject === undefined ? {} : mapsObject; mapsObject = mapsObject || {};
var mapKeysList = Object.keys( mapsObject ); var mapKeysList = Object.keys( mapsObject );
var items = mapKeysList.map( function ( mapKey ) { var items = mapKeysList.map( function ( mapKey ) {
@ -535,7 +535,7 @@ Dialog.prototype.populateMapsItems = function ( mapsObject ) {
Dialog.prototype.onMapInfoChange = function ( value ) { Dialog.prototype.onMapInfoChange = function ( value ) {
var selectedItem = this.mapsGroup.findSelectedItem(); var selectedItem = this.mapsGroup.findSelectedItem();
// Update map Info // Update map Info
this.model.maps = this.model.getMapInfo() === undefined ? {} : this.model.getMapInfo(); this.model.maps = this.model.getMapInfo() || {};
if ( selectedItem ) { if ( selectedItem ) {
if ( this.model.getMapInfo()[ selectedItem.label ] !== value ) { if ( this.model.getMapInfo()[ selectedItem.label ] !== value ) {
// Disable Done button in case of invalid JSON // Disable Done button in case of invalid JSON