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

MWTransclusionNode: Implement MWTransclusionTableCell

Browse source 
Back in de98382a55, references to MWTransclusionTableCell were introduced,
but weren't followed through on. So, actually add it. Have cellable
Transclusions use it as their type.

Bug: T144122
Depends-On: I054f12f4218102a12d7a9ea843f9c61e8825c52c
Change-Id: I367f878bfd1c58e20b62368cb78120604b48d791
This commit is contained in:
David Lynch 2017-05-04 11:58:30 -05:00
parent a6f304c347
commit 0eb6b94b4c
2 changed files with 68 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
View file

@ -13,7 +13,6 @@
* @extends ve.ce.LeafNode
* @mixins ve.ce.GeneratedContentNode
* @mixins ve.ce.FocusableNode
* @mixins ve.ce.TableCellableNode
*
* @constructor
* @param {ve.dm.MWTransclusionNode} model Model to observe
@ -26,7 +25,6 @@ ve.ce.MWTransclusionNode = function VeCeMWTransclusionNode( model, config ) {
// Mixin constructors
ve.ce.GeneratedContentNode.call( this );
ve.ce.FocusableNode.call( this );
ve.ce.TableCellableNode.call( this );
};
/* Inheritance */
@ -35,7 +33,6 @@ OO.inheritClass( ve.ce.MWTransclusionNode, ve.ce.LeafNode );
OO.mixinClass( ve.ce.MWTransclusionNode, ve.ce.GeneratedContentNode );
OO.mixinClass( ve.ce.MWTransclusionNode, ve.ce.FocusableNode );
OO.mixinClass( ve.ce.MWTransclusionNode, ve.ce.TableCellableNode );
/* Static Properties */
@ -262,8 +259,36 @@ ve.ce.MWTransclusionInlineNode.static.name = 'mwTransclusionInline';
ve.ce.MWTransclusionInlineNode.static.tagName = 'span';
/**
* ContentEditable MediaWiki transclusion table cell node.
*
* @class
* @extends ve.ce.MWTransclusionNode
* @constructor
* @mixins ve.ce.TableCellableNode
* @param {ve.dm.MWTransclusionTableCellNode} model Model to observe
*/
ve.ce.MWTransclusionTableCellNode = function VeCeMWTransclusionTableCellNode( model ) {
// Parent constructor
ve.ce.MWTransclusionTableCellNode.super.call( this, model );
// Mixin constructors
ve.ce.TableCellableNode.call( this );
};
/* Inheritance */
OO.inheritClass( ve.ce.MWTransclusionTableCellNode, ve.ce.MWTransclusionNode );
OO.mixinClass( ve.ce.MWTransclusionTableCellNode, ve.ce.TableCellableNode );
/* Static Properties */
ve.ce.MWTransclusionTableCellNode.static.name = 'mwTransclusionTableCell';
/* Registration */
ve.ce.nodeFactory.register( ve.ce.MWTransclusionNode );
ve.ce.nodeFactory.register( ve.ce.MWTransclusionBlockNode );
ve.ce.nodeFactory.register( ve.ce.MWTransclusionInlineNode );
ve.ce.nodeFactory.register( ve.ce.MWTransclusionTableCellNode );

49
modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
View file

@ -25,7 +25,6 @@ ve.dm.MWTransclusionNode = function VeDmMWTransclusionNode() {
// Mixin constructors
ve.dm.GeneratedContentNode.call( this );
ve.dm.FocusableNode.call( this );
ve.dm.TableCellableNode.call( this );
// Properties
this.partsList = null;
@ -89,6 +88,15 @@ ve.dm.MWTransclusionNode.static.inlineType = 'mwTransclusionInline';
*/
ve.dm.MWTransclusionNode.static.blockType = 'mwTransclusionBlock';
/**
* Node type to use when the transclusion is cellable
*
* @static
* @property {string}
* @inheritable
*/
ve.dm.MWTransclusionNode.static.cellType = 'mwTransclusionTableCell';
ve.dm.MWTransclusionNode.static.toDataElement = function ( domElements, converter ) {
var dataElement,
mwDataJSON = domElements[ 0 ].getAttribute( 'data-mw' ),
@ -105,7 +113,7 @@ ve.dm.MWTransclusionNode.static.toDataElement = function ( domElements, converte
};
if ( domElements.length === 1 && [ 'td', 'th' ].indexOf( domElements[ 0 ].nodeName.toLowerCase() ) !== -1 ) {
dataElement.attributes.cellable = true;
dataElement.type = this.cellType;
ve.dm.TableCellableNode.static.setAttributes( dataElement.attributes, domElements );
}
@ -152,6 +160,8 @@ ve.dm.MWTransclusionNode.static.toDomElements = function ( dataElement, doc, con
els[ 0 ] = wrapTextNode( els[ 0 ] );
} else if ( originalDomElements ) {
els = [ doc.createElement( originalDomElements[ 0 ].nodeName ) ];
} else if ( dataElement.type === this.cellType ) {
els = [ doc.createElement( dataElement.attributes.style === 'header' ? 'th' : 'td' ) ];
} else {
els = [ doc.createElement( 'span' ) ];
}
@ -325,13 +335,6 @@ ve.dm.MWTransclusionNode.prototype.onAttributeChange = function ( key ) {
}
};
/**
* @inheritdoc
*/
ve.dm.MWTransclusionNode.prototype.isCellable = function () {
return !!this.getAttribute( 'cellable' );
};
/**
* Check if transclusion contains only a single template.
*
@ -444,8 +447,36 @@ ve.dm.MWTransclusionInlineNode.static.name = 'mwTransclusionInline';
ve.dm.MWTransclusionInlineNode.static.isContent = true;
/**
* DataModel MediaWiki transclusion table cell node.
*
* @class
* @extends ve.dm.MWTransclusionNode
*
* @constructor
* @param {Object} [element] Reference to element in linear model
*/
ve.dm.MWTransclusionTableCellNode = function VeDmMWTransclusionTableCellNode() {
// Parent constructor
ve.dm.MWTransclusionTableCellNode.super.apply( this, arguments );
// Mixin constructors
ve.dm.TableCellableNode.call( this );
};
OO.inheritClass( ve.dm.MWTransclusionTableCellNode, ve.dm.MWTransclusionNode );
OO.mixinClass( ve.dm.MWTransclusionTableCellNode, ve.dm.TableCellableNode );
ve.dm.MWTransclusionTableCellNode.static.matchTagNames = [];
ve.dm.MWTransclusionTableCellNode.static.name = 'mwTransclusionTableCell';
ve.dm.MWTransclusionTableCellNode.static.isCellable = true;
/* Registration */
ve.dm.modelRegistry.register( ve.dm.MWTransclusionNode );
ve.dm.modelRegistry.register( ve.dm.MWTransclusionBlockNode );
ve.dm.modelRegistry.register( ve.dm.MWTransclusionInlineNode );
ve.dm.modelRegistry.register( ve.dm.MWTransclusionTableCellNode );