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

Moved ve.ve.BranchNode.canNodeHaveSlug to ve.ce.Node.prototype.canHaveSlug

Browse source 
Change-Id: I6d5d9ca5a1c9878acb15e9526feb94986822b491
This commit is contained in:
Trevor Parscal 2012-05-24 14:01:17 -07:00
parent ebfafac3e2
commit c8ccdb9813
2 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/ve2/ce/ve.ce.BranchNode.js
View file

@ -78,22 +78,6 @@ ve.ce.BranchNode.getDomWrapper = function( model, key ) {
return $( '<' + type + '></' + type + '>' );
};
/**
* Checks if a node can have a slug before or after it.
*
* TODO: Implement it as a one of node rules instead of a static array
*
* @static
* @method
* @param {ve.ce.Node} node Node to check
* @returns {Boolean} Node can have a slug
*/
ve.ce.BranchNode.canNodeHaveSlug = function( node ) {
return !node.canContainContent() &&
node.getParentNodeTypes() === null &&
node.getType() !== 'text';
};
/* Methods */
/**
@ -173,7 +157,7 @@ ve.ce.BranchNode.prototype.onSplice = function( index, howmany ) {
// Iterate over all children of this branch and add slugs in appropriate places
for ( i = 0; i < this.children.length; i++ ) {
if ( ve.ce.BranchNode.canNodeHaveSlug( this.children[i] ) ) {
if ( this.children[i].canHaveSlug() ) {
if ( i === 0 ) {
// First sluggable child (left side)
this.$slugs = this.$slugs.add(
@ -184,7 +168,7 @@ ve.ce.BranchNode.prototype.onSplice = function( index, howmany ) {
// Last sluggable child (right side)
i === this.children.length - 1 ||
// Sluggable child followed by another sluggable child (in between)
( this.children[i + 1] && ve.ce.BranchNode.canNodeHaveSlug( this.children[i + 1] ) )
( this.children[i + 1] && this.children[i + 1].canHaveSlug() )
) {
this.$slugs = this.$slugs.add(
ve.ce.BranchNode.$slugTemplate.clone().insertAfter( this.children[i].$ )

11
modules/ve2/ce/ve.ce.Node.js
View file

@ -115,6 +115,17 @@ ve.ce.Node.prototype.isContent = function() {
return this.model.isContent();
};
/**
* Checks if this node can have a slug before or after it.
*
* @static
* @method
* @returns {Boolean} Node can have a slug
*/
ve.ce.Node.prototype.canHaveSlug = function() {
return !this.canContainContent() && this.getParentNodeTypes() === null && this.type !== 'text';
};
/**
* Gets model length.
*