X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fcore%2Fhtmlparser%2Ffragment.js;h=2d7f8ac1a2dc4af55694c1a2f1983147b5b3becd;hb=fb481ba0a7d298e3e7b9034fcb9f2afdc6e8e796;hp=bfa5cc57925c31bcd800e086e33f45a154e07f5c;hpb=f0610347140239143439a511ee2bd48cb784f470;p=ckeditor.git

diff --git a/_source/core/htmlparser/fragment.js b/_source/core/htmlparser/fragment.js
index bfa5cc5..2d7f8ac 100644
--- a/_source/core/htmlparser/fragment.js
+++ b/_source/core/htmlparser/fragment.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
 */
 
@@ -49,6 +49,13 @@ CKEDITOR.htmlParser.fragment = function()
 	// Dtd of the fragment element, basically it accept anything except for intermediate structure, e.g. orphan <li>.
 	var rootDtd = CKEDITOR.tools.extend( {}, { html: 1 }, CKEDITOR.dtd.html, CKEDITOR.dtd.body, CKEDITOR.dtd.head, { style:1,script:1 } );
 
+	function isRemoveEmpty( node )
+	{
+		// Empty link is to be removed when empty but not anchor. (#7894)
+		return node.name == 'a' && node.attributes.href
+			|| CKEDITOR.dtd.$removeEmpty[ node.name ];
+	}
+
 	/**
 	 * Creates a {@link CKEDITOR.htmlParser.fragment} from an HTML string.
 	 * @param {String} fragmentHtml The HTML to be parsed, filling the fragment.
@@ -67,6 +74,8 @@ CKEDITOR.htmlParser.fragment = function()
 			pendingInline = [],
 			pendingBRs = [],
 			currentNode = fragment,
+		    // Indicate we're inside a <textarea> element, spaces should be touched differently.
+			inTextarea = false,
 		    // Indicate we're inside a <pre> element, spaces should be touched differently.
 			inPre = false;
 
@@ -104,6 +113,13 @@ CKEDITOR.htmlParser.fragment = function()
 						pendingInline.splice( i, 1 );
 						i--;
 					}
+					else
+					{
+						// Some element of the same type cannot be nested, flat them,
+						// e.g. <a href="#">foo<a href="#">bar</a></a>. (#7894)
+						if ( pendingName == currentNode.name )
+							addElement( currentNode, currentNode.parent, 1 ), i--;
+					}
 				}
 			}
 		}
@@ -111,7 +127,7 @@ CKEDITOR.htmlParser.fragment = function()
 		function sendPendingBRs()
 		{
 			while ( pendingBRs.length )
-				currentNode.add( pendingBRs.shift() );
+				addElement( pendingBRs.shift(), currentNode );
 		}
 
 		/*
@@ -161,7 +177,7 @@ CKEDITOR.htmlParser.fragment = function()
 
 			// Rtrim empty spaces on block end boundary. (#3585)
 			if ( element._.isBlockLike
-				 && element.name != 'pre' )
+				 && element.name != 'pre' && element.name != 'textarea' )
 			{
 
 				var length = element.children.length,
@@ -178,6 +194,13 @@ CKEDITOR.htmlParser.fragment = function()
 
 			target.add( element );
 
+			if ( element.name == 'pre' )
+				inPre = false;
+
+			if ( element.name == 'textarea' )
+				inTextarea = false;
+
+
 			if ( element.returnPoint )
 			{
 				currentNode = element.returnPoint;
@@ -200,7 +223,7 @@ CKEDITOR.htmlParser.fragment = function()
 			element.isOptionalClose = tagName in optionalCloseTags || optionalClose;
 
 			// This is a tag to be removed if empty, so do not add it immediately.
-			if ( CKEDITOR.dtd.$removeEmpty[ tagName ] )
+			if ( isRemoveEmpty( element ) )
 			{
 				pendingInline.push( element );
 				return;
@@ -212,6 +235,8 @@ CKEDITOR.htmlParser.fragment = function()
 				currentNode.add( new CKEDITOR.htmlParser.text( '\n' ) );
 				return;
 			}
+			else if ( tagName == 'textarea' )
+				inTextarea = true;
 
 			if ( tagName == 'br' )
 			{
@@ -342,9 +367,6 @@ CKEDITOR.htmlParser.fragment = function()
 
 				currentNode = candidate;
 
-				if ( currentNode.name == 'pre' )
-					inPre = false;
-
 				if ( candidate._.isBlockLike )
 					sendPendingBRs();
 
@@ -364,8 +386,8 @@ CKEDITOR.htmlParser.fragment = function()
 
 		parser.onText = function( text )
 		{
-			// Trim empty spaces at beginning of text contents except <pre>.
-			if ( ( !currentNode._.hasInlineStarted || pendingBRs.length ) && !inPre )
+			// Trim empty spaces at beginning of text contents except <pre> and <textarea>.
+			if ( ( !currentNode._.hasInlineStarted || pendingBRs.length ) && !inPre && !inTextarea )
 			{
 				text = CKEDITOR.tools.ltrim( text );
 
@@ -373,6 +395,24 @@ CKEDITOR.htmlParser.fragment = function()
 					return;
 			}
 
+			var currentName = currentNode.name,
+			currentDtd = currentName ? ( CKEDITOR.dtd[ currentName ]
+							|| ( currentNode._.isBlockLike ?
+								 CKEDITOR.dtd.div : CKEDITOR.dtd.span ) ) : rootDtd;
+
+			// Fix orphan text in list/table. (#8540) (#8870)
+			if ( !inTextarea &&
+				 !currentDtd [ '#' ] &&
+				 currentName in nonBreakingBlocks )
+			{
+				parser.onTagOpen( currentName in listBlocks ? 'li' :
+								  currentName == 'dl' ? 'dd' :
+								  currentName == 'table' ? 'tr' :
+								  currentName == 'tr' ? 'td' : '' );
+				parser.onText( text );
+				return;
+			}
+
 			sendPendingBRs();
 			checkPending();
 
@@ -385,7 +425,7 @@ CKEDITOR.htmlParser.fragment = function()
 
 			// Shrinking consequential spaces into one single for all elements
 			// text contents.
-			if ( !inPre )
+			if ( !inPre && !inTextarea )
 				text = text.replace( /[\t\r\n ]{2,}|[\t\r\n]/g, ' ' );
 
 			currentNode.add( new CKEDITOR.htmlParser.text( text ) );