wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Replacing MWTitleInputWidget.getValue() with MWTitleInputWidget.getTitle()"

Browse source
This commit is contained in:
jenkins-bot 2014-11-04 01:18:38 +00:00 committed by Gerrit Code Review
parent 666001ba1c 0165a53044
commit bb96a9083f
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,16 +81,22 @@ ve.dm.MWTemplateModel.newFromData = function ( transclusion, data ) {
* namespace, using a leading colon to access other namespaces.
*
* @param {ve.dm.MWTransclusionModel} transclusion Transclusion template is in
* @param {string} name Template name
* @returns {ve.dm.MWTemplateModel} New template model
* @param {string|mw.Title} name Template name
* @returns {ve.dm.MWTemplateModel|null} New template model
*/
ve.dm.MWTemplateModel.newFromName = function ( transclusion, name ) {
var href = name;
var href, title;
if ( name instanceof mw.Title ) {
title = name;
} else {
title = mw.Title.newFromText( href, mw.config.get( 'wgNamespaceIds' ).template );
}
if ( title !== null ) {
href = title.getPrefixedText();
return new ve.dm.MWTemplateModel( transclusion, { href: href, wt: name }, 'user' );
}
// TODO: Do we need to account for the title being invalid?
href = new mw.Title( href, mw.config.get( 'wgNamespaceIds' ).template ).getPrefixedText();
return new ve.dm.MWTemplateModel( transclusion, { href: href, wt: name }, 'user' );
return null;
};
/* Methods */

6
modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
View file

@ -100,15 +100,15 @@ ve.ui.MWTemplatePlaceholderPage.prototype.onAddTemplate = function () {
if ( menu.isVisible() ) {
menu.chooseItem( menu.getSelectedItem() );
}
part = ve.dm.MWTemplateModel.newFromName( transclusion, this.addTemplateInput.getValue() );
part = ve.dm.MWTemplateModel.newFromName( transclusion, this.addTemplateInput.getTitle() );
transclusion.replacePart( this.placeholder, part );
this.addTemplateInput.pushPending();
this.addTemplateButton.setDisabled( true );
this.removeButton.setDisabled( true );
};
ve.ui.MWTemplatePlaceholderPage.prototype.onTemplateInputChange = function ( value ) {
this.addTemplateButton.setDisabled( value.trim() === '' );
ve.ui.MWTemplatePlaceholderPage.prototype.onTemplateInputChange = function () {
this.addTemplateButton.setDisabled( this.addTemplateInput.getTitle() === null );
};
ve.ui.MWTemplatePlaceholderPage.prototype.onRemoveButtonClick = function () {

3
modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
View file

@ -127,7 +127,8 @@ ve.ui.MWTitleInputWidget.prototype.getLookupMenuItemsFromData = function ( data
*/
ve.ui.MWTitleInputWidget.prototype.getTitle = function () {
var title = this.getValue(),
titleObj = mw.Title.newFromText( title );
//mw.Title doesn't handle null well
titleObj = mw.Title.newFromText( title, this.namespace !== null ? this.namespace : undefined );
return titleObj;
};