X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fcore%2Fhtmlparser%2Ffragment.js;h=f69f7cdca5a42b1ea0b63a5b353e5ca20a81f35b;hb=e73319a12b56100b29ef456fd74114fe5519e01c;hp=8c3ad5d3b960f98564078c2e139cfc93b6280f91;hpb=4e90e78dc97789709ee7404359a5517540c27553;p=ckeditor.git

diff --git a/_source/core/htmlparser/fragment.js b/_source/core/htmlparser/fragment.js
index 8c3ad5d..f69f7cd 100644
--- a/_source/core/htmlparser/fragment.js
+++ b/_source/core/htmlparser/fragment.js
@@ -41,11 +41,21 @@ CKEDITOR.htmlParser.fragment = function()
 	// parser fixing.
 	var nonBreakingBlocks = CKEDITOR.tools.extend( { table:1,ul:1,ol:1,dl:1 }, CKEDITOR.dtd.table, CKEDITOR.dtd.ul, CKEDITOR.dtd.ol, CKEDITOR.dtd.dl );
 
+	// IE < 8 don't output the close tag on definition list items. (#6975)
+	var optionalCloseTags = CKEDITOR.env.ie && CKEDITOR.env.version < 8 ? { dd : 1, dt :1 } : {};
+
 	var listBlocks = { ol:1, ul:1 };
 
 	// 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.
@@ -64,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;
 
@@ -101,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--;
+					}
 				}
 			}
 		}
@@ -158,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,
@@ -193,10 +212,11 @@ CKEDITOR.htmlParser.fragment = function()
 			if ( element.isUnknown && selfClosing )
 				element.isEmpty = true;
 
-			element.isOptionalClose = optionalClose;
+			// Check for optional closed elements, including browser quirks and manually opened blocks.
+			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;
@@ -208,6 +228,8 @@ CKEDITOR.htmlParser.fragment = function()
 				currentNode.add( new CKEDITOR.htmlParser.text( '\n' ) );
 				return;
 			}
+			else if ( tagName == 'textarea' )
+				inTextarea = true;
 
 			if ( tagName == 'br' )
 			{
@@ -341,6 +363,9 @@ CKEDITOR.htmlParser.fragment = function()
 				if ( currentNode.name == 'pre' )
 					inPre = false;
 
+				if ( currentNode.name == 'textarea' )
+					inTextarea = false;
+
 				if ( candidate._.isBlockLike )
 					sendPendingBRs();
 
@@ -360,8 +385,8 @@ CKEDITOR.htmlParser.fragment = function()
 
 		parser.onText = function( text )
 		{
-			// Trim empty spaces at beginning of element contents except <pre>.
-			if ( !currentNode._.hasInlineStarted && !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 );
 
@@ -381,7 +406,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 ) );
@@ -420,13 +445,14 @@ CKEDITOR.htmlParser.fragment = function()
 		 *		following types: {@link CKEDITOR.htmlParser.element},
 		 *		{@link CKEDITOR.htmlParser.text} and
 		 *		{@link CKEDITOR.htmlParser.comment}.
+		 *	@param {Number} [index] From where the insertion happens.
 		 * @example
 		 */
-		add : function( node )
+		add : function( node, index )
 		{
-			var len = this.children.length,
-				previous = len > 0 && this.children[ len - 1 ] || null;
+			isNaN( index ) && ( index = this.children.length );
 
+			var previous = index > 0 ? this.children[ index - 1 ] : null;
 			if ( previous )
 			{
 				// If the block to be appended is following text, trim spaces at
@@ -451,7 +477,7 @@ CKEDITOR.htmlParser.fragment = function()
 			node.previous = previous;
 			node.parent = this;
 
-			this.children.push( node );
+			this.children.splice( index, 0, node );
 
 			this._.hasInlineStarted = node.type == CKEDITOR.NODE_TEXT || ( node.type == CKEDITOR.NODE_ELEMENT && !node._.isBlockLike );
 		},