wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-24 10:48:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Rename MWTemplateParameter* classes to MWParameter*"

Browse source
This commit is contained in:
jenkins-bot 2014-02-26 17:57:07 +00:00 committed by Gerrit Code Review
parent 9204d0d22f e2f6d798b8
commit 4862818c7f
7 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
VisualEditor.php
View file

@ -566,7 +566,7 @@ $wgResourceModules += array(
'modules/ve-mw/dm/models/ve.dm.MWTemplateSpecModel.js', 'modules/ve-mw/dm/models/ve.dm.MWTemplateSpecModel.js',
'modules/ve-mw/dm/models/ve.dm.MWTemplateModel.js', 'modules/ve-mw/dm/models/ve.dm.MWTemplateModel.js',
'modules/ve-mw/dm/models/ve.dm.MWTemplatePlaceholderModel.js', 'modules/ve-mw/dm/models/ve.dm.MWTemplatePlaceholderModel.js',
'modules/ve-mw/dm/models/ve.dm.MWTemplateParameterModel.js', 'modules/ve-mw/dm/models/ve.dm.MWParameterModel.js',
// ce // ce
'modules/ve-mw/ce/ve.ce.MWResizableNode.js', 'modules/ve-mw/ce/ve.ce.MWResizableNode.js',
@ -609,7 +609,7 @@ $wgResourceModules += array(
'modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js', 'modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js',
'modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js', 'modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js',
'modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js', 'modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js',
'modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js', 'modules/ve-mw/ui/pages/ve.ui.MWParameterPage.js',
'modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js', 'modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js',
'modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js', 'modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js',

22
modules/ve-mw/dm/models/ve.dm.MWTemplateParameterModel.js → modules/ve-mw/dm/models/ve.dm.MWParameterModel.js
View file

@ -1,5 +1,5 @@
/*! /*!
* VisualEditor DataModel MWTemplateParameterModel class. * VisualEditor DataModel MWParameterModel class.
* *
* @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt * @license The MIT License (MIT); see LICENSE.txt
@ -16,7 +16,7 @@
* @param {string} name Parameter name * @param {string} name Parameter name
* @param {string} value Parameter value * @param {string} value Parameter value
*/ */
ve.dm.MWTemplateParameterModel = function VeDmMWTemplateParameterModel( template, name, value ) { ve.dm.MWParameterModel = function VeDmMWParameterModel( template, name, value ) {
// Mixin constructors // Mixin constructors
OO.EventEmitter.call( this ); OO.EventEmitter.call( this );
@ -30,7 +30,7 @@ ve.dm.MWTemplateParameterModel = function VeDmMWTemplateParameterModel( template
/* Inheritance */ /* Inheritance */
OO.mixinClass( ve.dm.MWTemplateParameterModel, OO.EventEmitter ); OO.mixinClass( ve.dm.MWParameterModel, OO.EventEmitter );
/* Events */ /* Events */
@ -47,7 +47,7 @@ OO.mixinClass( ve.dm.MWTemplateParameterModel, OO.EventEmitter );
* @param {string} name Parameter name * @param {string} name Parameter name
* @returns {boolean} Parameter is required * @returns {boolean} Parameter is required
*/ */
ve.dm.MWTemplateParameterModel.prototype.isRequired = function () { ve.dm.MWParameterModel.prototype.isRequired = function () {
return this.template.getSpec().isParameterRequired( this.name ); return this.template.getSpec().isParameterRequired( this.name );
}; };
@ -56,7 +56,7 @@ ve.dm.MWTemplateParameterModel.prototype.isRequired = function () {
* *
* @returns {ve.dm.MWTemplateModel} Template * @returns {ve.dm.MWTemplateModel} Template
*/ */
ve.dm.MWTemplateParameterModel.prototype.getTemplate = function () { ve.dm.MWParameterModel.prototype.getTemplate = function () {
return this.template; return this.template;
}; };
@ -65,7 +65,7 @@ ve.dm.MWTemplateParameterModel.prototype.getTemplate = function () {
* *
* @returns {string} Unique ID * @returns {string} Unique ID
*/ */
ve.dm.MWTemplateParameterModel.prototype.getId = function () { ve.dm.MWParameterModel.prototype.getId = function () {
return this.id; return this.id;
}; };
@ -74,7 +74,7 @@ ve.dm.MWTemplateParameterModel.prototype.getId = function () {
* *
* @returns {string} Parameter name * @returns {string} Parameter name
*/ */
ve.dm.MWTemplateParameterModel.prototype.getName = function () { ve.dm.MWParameterModel.prototype.getName = function () {
return this.name; return this.name;
}; };
@ -83,7 +83,7 @@ ve.dm.MWTemplateParameterModel.prototype.getName = function () {
* *
* @returns {string} Parameter name * @returns {string} Parameter name
*/ */
ve.dm.MWTemplateParameterModel.prototype.getOriginalName = function () { ve.dm.MWParameterModel.prototype.getOriginalName = function () {
return this.originalName; return this.originalName;
}; };
@ -92,7 +92,7 @@ ve.dm.MWTemplateParameterModel.prototype.getOriginalName = function () {
* *
* @returns {string} Parameter value * @returns {string} Parameter value
*/ */
ve.dm.MWTemplateParameterModel.prototype.getValue = function () { ve.dm.MWParameterModel.prototype.getValue = function () {
return this.value; return this.value;
}; };
@ -101,7 +101,7 @@ ve.dm.MWTemplateParameterModel.prototype.getValue = function () {
* *
* @param {string} value Parameter value * @param {string} value Parameter value
*/ */
ve.dm.MWTemplateParameterModel.prototype.setValue = function ( value ) { ve.dm.MWParameterModel.prototype.setValue = function ( value ) {
this.value = value; this.value = value;
this.emit( 'change' ); this.emit( 'change' );
}; };
@ -109,6 +109,6 @@ ve.dm.MWTemplateParameterModel.prototype.setValue = function ( value ) {
/** /**
* Remove parameter from template. * Remove parameter from template.
*/ */
ve.dm.MWTemplateParameterModel.prototype.remove = function () { ve.dm.MWParameterModel.prototype.remove = function () {
this.template.removeParameter( this ); this.template.removeParameter( this );
}; };

16
modules/ve-mw/dm/models/ve.dm.MWTemplateModel.js
View file

@ -42,12 +42,12 @@ OO.inheritClass( ve.dm.MWTemplateModel, ve.dm.MWTransclusionPartModel );
/** /**
* @event add * @event add
* @param {ve.dm.MWTemplateParameterModel} param Added param * @param {ve.dm.MWParameterModel} param Added param
*/ */
/** /**
* @event remove * @event remove
* @param {ve.dm.MWTemplateParameterModel} param Removed param * @param {ve.dm.MWParameterModel} param Removed param
*/ */
/* Static Methods */ /* Static Methods */
@ -67,7 +67,7 @@ ve.dm.MWTemplateModel.newFromData = function ( transclusion, data ) {
for ( key in data.params ) { for ( key in data.params ) {
template.addParameter( template.addParameter(
new ve.dm.MWTemplateParameterModel( template, key, data.params[key].wt, 'data' ) new ve.dm.MWParameterModel( template, key, data.params[key].wt, 'data' )
); );
} }
@ -131,7 +131,7 @@ ve.dm.MWTemplateModel.prototype.getSpec = function () {
/** /**
* Get all params. * Get all params.
* *
* @returns {Object.<string,ve.dm.MWTemplateParameterModel>} Parameters keyed by name * @returns {Object.<string,ve.dm.MWParameterModel>} Parameters keyed by name
*/ */
ve.dm.MWTemplateModel.prototype.getParameters = function () { ve.dm.MWTemplateModel.prototype.getParameters = function () {
return this.params; return this.params;
@ -141,7 +141,7 @@ ve.dm.MWTemplateModel.prototype.getParameters = function () {
* Get a parameter. * Get a parameter.
* *
* @param {string} name Parameter name * @param {string} name Parameter name
* @returns {ve.dm.MWTemplateParameterModel} Parameter * @returns {ve.dm.MWParameterModel} Parameter
*/ */
ve.dm.MWTemplateModel.prototype.getParameter = function ( name ) { ve.dm.MWTemplateModel.prototype.getParameter = function ( name ) {
return this.params[name]; return this.params[name];
@ -231,7 +231,7 @@ ve.dm.MWTemplateModel.prototype.getParameterNames = function () {
/** /**
* Add a parameter to template. * Add a parameter to template.
* *
* @param {ve.dm.MWTemplateParameterModel} param Parameter to add * @param {ve.dm.MWParameterModel} param Parameter to add
* @fires add * @fires add
*/ */
ve.dm.MWTemplateModel.prototype.addParameter = function ( param ) { ve.dm.MWTemplateModel.prototype.addParameter = function ( param ) {
@ -247,7 +247,7 @@ ve.dm.MWTemplateModel.prototype.addParameter = function ( param ) {
/** /**
* Remove parameter from template. * Remove parameter from template.
* *
* @param {ve.dm.MWTemplateParameterModel} param Parameter to remove * @param {ve.dm.MWParameterModel} param Parameter to remove
* @fires remove * @fires remove
*/ */
ve.dm.MWTemplateModel.prototype.removeParameter = function ( param ) { ve.dm.MWTemplateModel.prototype.removeParameter = function ( param ) {
@ -272,7 +272,7 @@ ve.dm.MWTemplateModel.prototype.addRequiredParameters = function () {
for ( i = 0, len = names.length; i < len; i++ ) { for ( i = 0, len = names.length; i < len; i++ ) {
if ( !this.params[name] && spec.isParameterRequired( names[i] ) ) { if ( !this.params[name] && spec.isParameterRequired( names[i] ) ) {
this.addParameter( new ve.dm.MWTemplateParameterModel( this, names[i] ) ); this.addParameter( new ve.dm.MWParameterModel( this, names[i] ) );
} }
} }
}; };

4
modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
View file

@ -387,7 +387,7 @@ ve.dm.MWTransclusionModel.prototype.getParts = function () {
*/ */
ve.dm.MWTransclusionModel.prototype.getPartFromId = function ( id ) { ve.dm.MWTransclusionModel.prototype.getPartFromId = function ( id ) {
var i, len, var i, len,
// For ids from ve.dm.MWTemplateParameterModel, compare against the part id // For ids from ve.dm.MWParameterModel, compare against the part id
// of the parameter instead of the entire model id (e.g. "part_1" instead of "part_1/foo"). // of the parameter instead of the entire model id (e.g. "part_1" instead of "part_1/foo").
partId = id.split( '/' )[0]; partId = id.split( '/' )[0];
@ -404,7 +404,7 @@ ve.dm.MWTransclusionModel.prototype.getPartFromId = function ( id ) {
* *
* Indexes are linear depth-first addresses in the transclusion tree. * Indexes are linear depth-first addresses in the transclusion tree.
* *
* @param {ve.dm.MWTransclusionPartModel|ve.dm.MWTemplateParameterModel} model Part or parameter * @param {ve.dm.MWTransclusionPartModel|ve.dm.MWParameterModel} model Part or parameter
* @returns {number} Page index of model * @returns {number} Page index of model
*/ */
ve.dm.MWTransclusionModel.prototype.getIndex = function ( model ) { ve.dm.MWTransclusionModel.prototype.getIndex = function ( model ) {

6
modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
View file

@ -105,10 +105,10 @@ ve.ui.MWTransclusionDialog.prototype.onReplacePart = function ( removed, added )
/** /**
* Handle add param events. * Handle add param events.
* *
* @param {ve.dm.MWTemplateParameterModel} param Added param * @param {ve.dm.MWParameterModel} param Added param
*/ */
ve.ui.MWTransclusionDialog.prototype.onAddParameter = function ( param ) { ve.ui.MWTransclusionDialog.prototype.onAddParameter = function ( param ) {
var page = new ve.ui.MWTemplateParameterPage( param, param.getId(), { '$': this.$ } ); var page = new ve.ui.MWParameterPage( param, param.getId(), { '$': this.$ } );
this.bookletLayout.addPages( [ page ], this.transclusion.getIndex( param ) ); this.bookletLayout.addPages( [ page ], this.transclusion.getIndex( param ) );
if ( this.loaded ) { if ( this.loaded ) {
this.setPageByName( param.getId() ); this.setPageByName( param.getId() );
@ -118,7 +118,7 @@ ve.ui.MWTransclusionDialog.prototype.onAddParameter = function ( param ) {
/** /**
* Handle remove param events. * Handle remove param events.
* *
* @param {ve.dm.MWTemplateParameterModel} param Removed param * @param {ve.dm.MWParameterModel} param Removed param
*/ */
ve.ui.MWTransclusionDialog.prototype.onRemoveParameter = function ( param ) { ve.ui.MWTransclusionDialog.prototype.onRemoveParameter = function ( param ) {
this.bookletLayout.removePages( [ this.bookletLayout.getPage( param.getId() ) ] ); this.bookletLayout.removePages( [ this.bookletLayout.getPage( param.getId() ) ] );

14
modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js → modules/ve-mw/ui/pages/ve.ui.MWParameterPage.js
View file

@ -1,5 +1,5 @@
/*! /*!
* VisualEditor user interface MWTemplateParameterPage class. * VisualEditor user interface MWParameterPage class.
* *
* @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
* @license The MIT License (MIT); see LICENSE.txt * @license The MIT License (MIT); see LICENSE.txt
@ -12,11 +12,11 @@
* @extends OO.ui.PageLayout * @extends OO.ui.PageLayout
* *
* @constructor * @constructor
* @param {ve.dm.MWTemplateParameterModel} parameter Template parameter * @param {ve.dm.MWParameterModel} parameter Template parameter
* @param {string} name Unique symbolic name of page * @param {string} name Unique symbolic name of page
* @param {Object} [config] Configuration options * @param {Object} [config] Configuration options
*/ */
ve.ui.MWTemplateParameterPage = function VeUiMWTemplateParameter( parameter, name, config ) { ve.ui.MWParameterPage = function VeUiMWParameter( parameter, name, config ) {
var spec = parameter.getTemplate().getSpec(); var spec = parameter.getTemplate().getSpec();
// Parent constructor // Parent constructor
@ -65,14 +65,14 @@ ve.ui.MWTemplateParameterPage = function VeUiMWTemplateParameter( parameter, nam
/* Inheritance */ /* Inheritance */
OO.inheritClass( ve.ui.MWTemplateParameterPage, OO.ui.PageLayout ); OO.inheritClass( ve.ui.MWParameterPage, OO.ui.PageLayout );
/* Methods */ /* Methods */
/** /**
* @inheritdoc * @inheritdoc
*/ */
ve.ui.MWTemplateParameterPage.prototype.setOutlineItem = function ( outlineItem ) { ve.ui.MWParameterPage.prototype.setOutlineItem = function ( outlineItem ) {
// Parent method // Parent method
OO.ui.PageLayout.prototype.setOutlineItem.call( this, outlineItem ); OO.ui.PageLayout.prototype.setOutlineItem.call( this, outlineItem );
@ -91,10 +91,10 @@ ve.ui.MWTemplateParameterPage.prototype.setOutlineItem = function ( outlineItem
} }
}; };
ve.ui.MWTemplateParameterPage.prototype.onTextInputChange = function () { ve.ui.MWParameterPage.prototype.onTextInputChange = function () {
this.parameter.setValue( this.valueInput.getValue() ); this.parameter.setValue( this.valueInput.getValue() );
}; };
ve.ui.MWTemplateParameterPage.prototype.onRemoveButtonClick = function () { ve.ui.MWParameterPage.prototype.onRemoveButtonClick = function () {
this.parameter.remove(); this.parameter.remove();
}; };

2
modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
View file

@ -83,7 +83,7 @@ ve.ui.MWTemplatePage.prototype.onParameterSelect = function ( name ) {
var param; var param;
if ( name ) { if ( name ) {
param = new ve.dm.MWTemplateParameterModel( this.template, name ); param = new ve.dm.MWParameterModel( this.template, name );
this.template.addParameter( param ); this.template.addParameter( param );
this.addParameterSearch.query.setValue(); this.addParameterSearch.query.setValue();
} }