From c8ccdb9813d0ca537e03efb9ddccb2e22c330a41 Mon Sep 17 00:00:00 2001
From: Trevor Parscal <trevorparscal@gmail.com>
Date: Thu, 24 May 2012 14:01:17 -0700
Subject: [PATCH] Moved ve.ve.BranchNode.canNodeHaveSlug to
 ve.ce.Node.prototype.canHaveSlug

Change-Id: I6d5d9ca5a1c9878acb15e9526feb94986822b491
---
 modules/ve2/ce/ve.ce.BranchNode.js | 20 ++------------------
 modules/ve2/ce/ve.ce.Node.js       | 11 +++++++++++
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/modules/ve2/ce/ve.ce.BranchNode.js b/modules/ve2/ce/ve.ce.BranchNode.js
index dc7d0da71a..b1c6be8e54 100644
--- a/modules/ve2/ce/ve.ce.BranchNode.js
+++ b/modules/ve2/ce/ve.ce.BranchNode.js
@@ -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].$ )
diff --git a/modules/ve2/ce/ve.ce.Node.js b/modules/ve2/ce/ve.ce.Node.js
index fcd552b708..cbdcd55b1a 100644
--- a/modules/ve2/ce/ve.ce.Node.js
+++ b/modules/ve2/ce/ve.ce.Node.js
@@ -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.
  *