refinerycms-ckeditor 0.1.4 → 0.2.0

data/app/assets/javascripts/ckeditor/_source/core/dom/elementpath.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -46,8 +46,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 					this.lastElement = e;
 
 				var elementName = e.getName();
-				if ( CKEDITOR.env.ie && e.$.scopeName != 'HTML' )
-					elementName = e.$.scopeName.toLowerCase() + ':' + elementName;
 
 				if ( !blockLimit )
 				{

data/app/assets/javascripts/ckeditor/_source/core/dom/event.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/core/dom/node.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -23,21 +23,13 @@ CKEDITOR.dom.node = function( domNode )
 {
 	if ( domNode )
 	{
-		switch ( domNode.nodeType )
-		{
-			// Safari don't consider document as element node type. (#3389)
-			case CKEDITOR.NODE_DOCUMENT :
-				return new CKEDITOR.dom.document( domNode );
-
-			case CKEDITOR.NODE_ELEMENT :
-				return new CKEDITOR.dom.element( domNode );
+		var type = domNode.nodeType == CKEDITOR.NODE_DOCUMENT ? 'document'
+			: domNode.nodeType == CKEDITOR.NODE_ELEMENT ? 'element'
+			: domNode.nodeType == CKEDITOR.NODE_TEXT ? 'text'
+			: domNode.nodeType == CKEDITOR.NODE_COMMENT ? 'comment'
+			: 'domObject';  // Call the base constructor otherwise.
 
-			case CKEDITOR.NODE_TEXT :
-				return new CKEDITOR.dom.text( domNode );
-		}
-
-		// Call the base constructor.
-		CKEDITOR.dom.domObject.call( this, domNode );
+		return new CKEDITOR.dom[ type ]( domNode );
 	}
 
 	return this;
@@ -352,7 +344,10 @@ CKEDITOR.tools.extend( CKEDITOR.dom.node.prototype,
 			do
 			{
 				previous = previous.previousSibling;
-				retval = previous && new CKEDITOR.dom.node( previous );
+
+				// Avoid returning the doc type node.
+				// http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-412266927
+				retval = previous && previous.nodeType != 10 && new CKEDITOR.dom.node( previous );
 			}
 			while ( retval && evaluator && !evaluator( retval ) )
 			return retval;

data/app/assets/javascripts/ckeditor/_source/core/dom/nodelist.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/core/dom/range.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -380,16 +380,23 @@ CKEDITOR.dom.range = function( document )
 		};
 	}
 
+
+	var isBogus = CKEDITOR.dom.walker.bogus();
 	// Evaluator for CKEDITOR.dom.element::checkBoundaryOfElement, reject any
 	// text node and non-empty elements unless it's being bookmark text.
-	function elementBoundaryEval( node )
+	function elementBoundaryEval( checkStart )
 	{
-		// Reject any text node unless it's being bookmark
-		// OR it's spaces. (#3883)
-		return node.type != CKEDITOR.NODE_TEXT
-			    && node.getName() in CKEDITOR.dtd.$removeEmpty
-			    || !CKEDITOR.tools.trim( node.getText() )
-			    || !!node.getParent().data( 'cke-bookmark' );
+		return function( node )
+		{
+			// Tolerant bogus br when checking at the end of block.
+			// Reject any text node unless it's being bookmark
+			// OR it's spaces.
+			// Reject any element unless it's being invisible empty. (#3883)
+			return !checkStart && isBogus( node ) ||
+					( node.type == CKEDITOR.NODE_TEXT ?
+				   	   !CKEDITOR.tools.trim( node.getText() ) || !!node.getParent().data( 'cke-bookmark' )
+				   	   : node.getName() in CKEDITOR.dtd.$removeEmpty );
+		};
 	}
 
 	var whitespaceEval = new CKEDITOR.dom.walker.whitespaces(),
@@ -1014,7 +1021,12 @@ CKEDITOR.dom.range = function( document )
 							// whitespaces at the end.
 							isWhiteSpace = false;
 
-							if ( sibling.type == CKEDITOR.NODE_TEXT )
+							if ( sibling.type == CKEDITOR.NODE_COMMENT )
+							{
+								sibling = sibling.getPrevious();
+								continue;
+							}
+							else if ( sibling.type == CKEDITOR.NODE_TEXT )
 							{
 								siblingText = sibling.getText();
 
@@ -1044,7 +1056,7 @@ CKEDITOR.dom.range = function( document )
 											sibling = null;
 										else
 										{
-											var allChildren = sibling.$.all || sibling.$.getElementsByTagName( '*' );
+											var allChildren = sibling.$.getElementsByTagName( '*' );
 											for ( var i = 0, child ; child = allChildren[ i++ ] ; )
 											{
 												if ( !CKEDITOR.dtd.$removeEmpty[ child.nodeName.toLowerCase() ] )
@@ -1183,7 +1195,7 @@ CKEDITOR.dom.range = function( document )
 
 								isWhiteSpace = /^[\s\ufeff]/.test( siblingText );
 							}
-							else
+							else if ( sibling.type == CKEDITOR.NODE_ELEMENT )
 							{
 								// If this is a visible element.
 								// We need to check for the bookmark attribute because IE insists on
@@ -1204,7 +1216,7 @@ CKEDITOR.dom.range = function( document )
 											sibling = null;
 										else
 										{
-											allChildren = sibling.$.all || sibling.$.getElementsByTagName( '*' );
+											allChildren = sibling.$.getElementsByTagName( '*' );
 											for ( i = 0 ; child = allChildren[ i++ ] ; )
 											{
 												if ( !CKEDITOR.dtd.$removeEmpty[ child.nodeName.toLowerCase() ] )
@@ -1222,6 +1234,8 @@ CKEDITOR.dom.range = function( document )
 										sibling = null;
 								}
 							}
+							else
+								isWhiteSpace = 1;
 
 							if ( isWhiteSpace )
 							{
@@ -1793,7 +1807,7 @@ CKEDITOR.dom.range = function( document )
 			// Create the walker, which will check if we have anything useful
 			// in the range.
 			var walker = new CKEDITOR.dom.walker( walkerRange );
-			walker.evaluator = elementBoundaryEval;
+			walker.evaluator = elementBoundaryEval( checkStart );
 
 			return walker[ checkStart ? 'checkBackward' : 'checkForward' ]();
 		},

data/app/assets/javascripts/ckeditor/_source/core/dom/rangelist.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/core/dom/text.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/core/dom/walker.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -8,40 +8,50 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	// This function is to be called under a "walker" instance scope.
 	function iterate( rtl, breakOnFalse )
 	{
+		var range = this.range;
+
 		// Return null if we have reached the end.
 		if ( this._.end )
 			return null;
 
-		var node,
-			range = this.range,
-			guard,
-			userGuard = this.guard,
-			type = this.type,
-			getSourceNodeFn = ( rtl ? 'getPreviousSourceNode' : 'getNextSourceNode' );
-
 		// This is the first call. Initialize it.
 		if ( !this._.start )
 		{
 			this._.start = 1;
 
-			// Trim text nodes and optmize the range boundaries. DOM changes
-			// may happen at this point.
-			range.trim();
-
 			// A collapsed range must return null at first call.
 			if ( range.collapsed )
 			{
 				this.end();
 				return null;
 			}
+
+			// Move outside of text node edges.
+			range.optimize();
 		}
 
+		var node,
+			startCt = range.startContainer,
+			endCt = range.endContainer,
+			startOffset = range.startOffset,
+			endOffset = range.endOffset,
+			guard,
+			userGuard = this.guard,
+			type = this.type,
+			getSourceNodeFn = ( rtl ? 'getPreviousSourceNode' : 'getNextSourceNode' );
+
 		// Create the LTR guard function, if necessary.
 		if ( !rtl && !this._.guardLTR )
 		{
-			// Gets the node that stops the walker when going LTR.
-			var limitLTR = range.endContainer,
-				blockerLTR = limitLTR.getChild( range.endOffset );
+			// The node that stops walker from moving up.
+			var limitLTR = endCt.type == CKEDITOR.NODE_ELEMENT ?
+						   endCt :
+						   endCt.getParent();
+
+			// The node that stops the walker from going to next.
+			var blockerLTR = endCt.type == CKEDITOR.NODE_ELEMENT ?
+							 endCt.getChild( endOffset ) :
+							 endCt.getNext();
 
 			this._.guardLTR = function( node, movingOut )
 			{
@@ -54,9 +64,16 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		// Create the RTL guard function, if necessary.
 		if ( rtl && !this._.guardRTL )
 		{
-			// Gets the node that stops the walker when going LTR.
-			var limitRTL = range.startContainer,
-				blockerRTL = ( range.startOffset > 0 ) && limitRTL.getChild( range.startOffset - 1 );
+			// The node that stops walker from moving up.
+			var limitRTL = startCt.type == CKEDITOR.NODE_ELEMENT ?
+						   startCt :
+						   startCt.getParent();
+
+			// The node that stops the walker from going to next.
+			var blockerRTL = startCt.type == CKEDITOR.NODE_ELEMENT ?
+						 startOffset ?
+						 startCt.getChild( startOffset - 1 ) : null :
+						 startCt.getPrevious();
 
 			this._.guardRTL = function( node, movingOut )
 			{
@@ -89,35 +106,33 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		else
 		{
 			// Get the first node to be returned.
-
 			if ( rtl )
 			{
-				node = range.endContainer;
+				node = endCt;
 
-				if ( range.endOffset > 0 )
+				if ( node.type == CKEDITOR.NODE_ELEMENT )
 				{
-					node = node.getChild( range.endOffset - 1 );
-					if ( guard( node ) === false )
-						node = null;
+					if ( endOffset > 0 )
+						node = node.getChild( endOffset - 1 );
+					else
+						node = ( guard ( node, true ) === false ) ?
+							null : node.getPreviousSourceNode( true, type, guard );
 				}
-				else
-					node = ( guard ( node, true ) === false ) ?
-						null : node.getPreviousSourceNode( true, type, guard );
 			}
 			else
 			{
-				node = range.startContainer;
-				node = node.getChild( range.startOffset );
+				node = startCt;
 
-				if ( node )
+				if ( node.type == CKEDITOR.NODE_ELEMENT )
 				{
-					if ( guard( node ) === false )
-						node = null;
+					if ( ! ( node = node.getChild( startOffset ) ) )
+						node = ( guard ( startCt, true ) === false ) ?
+							null : startCt.getNextSourceNode( true, type, guard ) ;
 				}
-				else
-					node = ( guard ( range.startContainer, true ) === false ) ?
-						null : range.startContainer.getNextSourceNode( true, type, guard ) ;
 			}
+
+			if ( node && guard( node ) === false )
+				node = null;
 		}
 
 		while ( node && !this._.end )
@@ -431,6 +446,25 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		};
 	};
 
+	CKEDITOR.dom.walker.bogus = function( type, isReject )
+	{
+		function nonEmpty( node )
+		{
+			return !isWhitespaces( node ) && !isBookmark( node );
+		}
+
+		return function( node )
+		{
+			var parent = node.getParent(),
+				isBogus = !CKEDITOR.env.ie ? node.is && node.is( 'br' ) :
+					  node.getText && tailNbspRegex.test( node.getText() );
+
+			isBogus = isBogus && parent.isBlockBoundary() && !!parent.getLast( nonEmpty );
+
+			return !! ( isReject ^ isBogus );
+		};
+	};
+
 	var tailNbspRegex = /^[\t\r\n ]*(?: |\xa0)$/,
 		isWhitespaces = CKEDITOR.dom.walker.whitespaces(),
 		isBookmark = CKEDITOR.dom.walker.bookmark(),

data/app/assets/javascripts/ckeditor/_source/core/dom/window.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/core/dtd.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/core/editor.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/core/editor_basic.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/core/env.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/core/event.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/core/eventInfo.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/core/focusmanager.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/core/htmlparser.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/core/htmlparser/basicwriter.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/core/htmlparser/cdata.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 

data/app/assets/javascripts/ckeditor/_source/core/htmlparser/comment.js

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */