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

Merge "Use .static.isMeta to communicate meta-ness"

Browse source
This commit is contained in:
jenkins-bot 2013-02-14 18:47:48 +00:00 committed by Gerrit Code Review
parent 385606d6fe 28512c9488
commit a1bd1db241
4 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/ve/dm/nodes/ve.dm.MetaNode.js
View file

@ -29,6 +29,8 @@ ve.inheritClass( ve.dm.MetaNode, ve.dm.LeafNode );
ve.dm.MetaNode.static.name = 'meta'; ve.dm.MetaNode.static.name = 'meta';
ve.dm.MetaNode.static.isMeta = true;
ve.dm.MetaNode.static.matchTagNames = [ 'meta', 'link' ]; ve.dm.MetaNode.static.matchTagNames = [ 'meta', 'link' ];
ve.dm.MetaNode.static.toDataElement = function ( domElement, context ) { ve.dm.MetaNode.static.toDataElement = function ( domElement, context ) {

5
modules/ve/dm/ve.dm.Document.js
View file

@ -68,7 +68,10 @@ ve.dm.Document = function VeDmDocument( data, parentDocument ) {
// Track the length // Track the length
textLength++; textLength++;
} else { } else {
if ( this.data[i].type === 'metaInline' || this.data[i].type === 'metaBlock' ) { if (
this.data[i].type.charAt( 0 ) !== '/' &&
ve.dm.nodeFactory.isNodeMeta( this.data[i].type )
) {
// Metadata // Metadata
// Splice the meta element and its closing out of the linmod // Splice the meta element and its closing out of the linmod
meta = this.data[i]; meta = this.data[i];

11
modules/ve/dm/ve.dm.Node.js
View file

@ -139,6 +139,17 @@ ve.dm.Node.static.toDomElement = function ( /*dataElement*/ ) {
throw new Error( 've.dm.Node subclass must implement toDomElement' ); throw new Error( 've.dm.Node subclass must implement toDomElement' );
}; };
/**
* Whether this node type represents metadata.
*
* Linear model elements with this type will be moved out of the linear model into the metadata.
*
* @static
* @property {Boolean} static.isMeta
* @inheritable
*/
ve.dm.Node.static.isMeta = false;
/** /**
* Whether this node type has a wrapping element in the linear model. Most node types are wrapped, * Whether this node type has a wrapping element in the linear model. Most node types are wrapped,
* only special node types are not wrapped. * only special node types are not wrapped.

15
modules/ve/dm/ve.dm.NodeFactory.js
View file

@ -109,6 +109,21 @@ ve.dm.NodeFactory.prototype.canNodeHaveGrandchildren = function ( type ) {
throw new Error( 'Unknown node type: ' + type ); throw new Error( 'Unknown node type: ' + type );
}; };
/**
* Check if a node represents metadata.
*
* @method
* @param {string} type Node type
* @returns {boolean} The node is meta
* @throws {Error} Unknown node type
*/
ve.dm.NodeFactory.prototype.isNodeMeta = function ( type ) {
if ( type in this.registry ) {
return this.registry[type].static.isMeta;
}
throw new Error( 'Unknown node type: ' + type );
};
/** /**
* Check if a node has a wrapped element in the document data. * Check if a node has a wrapped element in the document data.
* *