Ticket #6972: dd_dt_li.patch

fragment.js

@@ -130 +130 @@
                                 else
                                         elementName =  element.name;
 
-                                if ( elementName && elementName in CKEDITOR.dtd.$inline )
+                                //revert to original
+                //better ? fix malform html
+                if (elementName
+                    && !( elementName in CKEDITOR.dtd.$body )
+                    && !( elementName in CKEDITOR.dtd.$nonBodyContent ))
                                 {
                                         var savedCurrent = currentNode;
 
-                                        // Create a <p> in the fragment.
-                                        currentNode = target;
-                                        parser.onTagOpen( fixForBody, {} );
+                                        // Create a <p/dl/ul> in the fragment.
+                    currentNode = target;
+                    var meta = {
+                        li:"ul",
+                        dt:"dl",
+                        dd:"dl"
+                    };
+                    parser.onTagOpen(meta[elementName] || fixForBody, {});
 
-                                        // The new target now is the <p>.
+                                        // The new target now is the <p/dl/ul>.
                                         target = currentNode;
 
                                         if ( enforceCurrent )
@@ -236 +245 @@
                                 {
                                         addElement( currentNode, currentNode.parent );
                                 }
-                                else if ( tagName in CKEDITOR.dtd.$listItem )
-                                {
-                                        parser.onTagOpen( 'ul', {} );
-                                        addPoint = currentNode;
-                                        reApply = true;
-                                }
+                //do not need this ??
+//                              else if ( tagName in CKEDITOR.dtd.$listItem )
+//                              {
+//                                      parser.onTagOpen( 'ul', {} );
+//                                      addPoint = currentNode;
+//                                      reApply = true;
+//                              }
                                 else
                                 {
-                                        if ( nonBreakingBlocks[ currentName ] )
+                    //sorry about this ugly exclusion,i am not actually sure
+                                        if (!currentName in {li:1,dd:1,dt:1} && nonBreakingBlocks[ currentName ])
                                         {
                                                 if ( !returnPoint )
                                                         returnPoint = currentNode;
@@ -253 +264 @@
                                         {
                                                 addElement( currentNode, currentNode.parent, true );
 
-                                                if ( !optionalClose[ currentName ] )
+                                                //only care about inline
+                        if (!optionalClose[ currentName ] && currentName in CKEDITOR.dtd.$inline)
                                                 {
                                                         // The current element is an inline element, which
                                                         // cannot hold the new one. Put it in the pending list,