vanilla ckeditor-3.0.2

[ckeditor.git] / _source / plugins / list / plugin.js

diff --git a/_source/plugins/list/plugin.js b/_source/plugins/list/plugin.js
index 45744e1..3898f2a 100644 (file)
--- a/_source/plugins/list/plugin.js
+++ b/_source/plugins/list/plugin.js
@@ -356,7 +356,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                compensateBrs( true );\r
                compensateBrs();\r
 \r
-               var rootParent = groupObj.root.getParent();\r
                docFragment.replace( groupObj.root );\r
        }\r
 \r
@@ -445,16 +444,18 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                while ( ( block = iterator.getNextParagraph() ) )\r
                                {\r
                                        var path = new CKEDITOR.dom.elementPath( block ),\r
+                                               pathElements = path.elements,\r
+                                               pathElementsCount = pathElements.length,\r
                                                listNode = null,\r
                                                processedFlag = false,\r
                                                blockLimit = path.blockLimit,\r
                                                element;\r
 \r
                                        // First, try to group by a list ancestor.\r
-                                       for ( var i = 0 ; i < path.elements.length &&\r
-                                                 ( element = path.elements[ i ] ) && !element.equals( blockLimit ); i++ )\r
+                                       for ( var i = pathElementsCount - 1; i >= 0 && ( element = pathElements[ i ] ); i-- )\r
                                        {\r
-                                               if ( listNodeNames[ element.getName() ] )\r
+                                               if ( listNodeNames[ element.getName() ]\r
+                                                        && blockLimit.contains( element ) )     // Don't leak outside block limit (#3940).\r
                                                {\r
                                                        // If we've encountered a list inside a block limit\r
                                                        // The last group object of the block limit element should\r
@@ -538,6 +539,68 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                }\r
        };\r
 \r
+       var dtd = CKEDITOR.dtd;\r
+       var tailNbspRegex = /[\t\r\n ]*(?:&nbsp;|\xa0)$/;\r
+\r
+       function indexOfFirstChildElement( element, tagNameList )\r
+       {\r
+               var child,\r
+                       children = element.children,\r
+                       length = children.length;\r
+\r
+               for ( var i = 0 ; i < length ; i++ )\r
+               {\r
+                       child = children[ i ];\r
+                       if ( child.name && ( child.name in tagNameList ) )\r
+                               return i;\r
+               }\r
+\r
+               return length;\r
+       }\r
+\r
+       function getExtendNestedListFilter( isHtmlFilter )\r
+       {\r
+               // An element filter function that corrects nested list start in an empty\r
+               // list item for better displaying/outputting. (#3165)\r
+               return function( listItem )\r
+               {\r
+                       var children = listItem.children,\r
+                               firstNestedListIndex = indexOfFirstChildElement( listItem, dtd.$list ),\r
+                               firstNestedList = children[ firstNestedListIndex ],\r
+                               nodeBefore = firstNestedList && firstNestedList.previous,\r
+                               tailNbspmatch;\r
+\r
+                       if( nodeBefore\r
+                               && ( nodeBefore.name && nodeBefore.name == 'br'\r
+                                       || nodeBefore.value && ( tailNbspmatch = nodeBefore.value.match( tailNbspRegex ) ) ) )\r
+                       {\r
+                               var fillerNode = nodeBefore;\r
+\r
+                               // Always use 'nbsp' as filler node if we found a nested list appear\r
+                               // in front of a list item.\r
+                               if ( !( tailNbspmatch && tailNbspmatch.index ) && fillerNode == children[ 0 ] )\r
+                                       children[ 0 ] = ( isHtmlFilter || CKEDITOR.env.ie ) ?\r
+                                                        new CKEDITOR.htmlParser.text( '\xa0' ) :\r
+                                                                        new CKEDITOR.htmlParser.element( 'br', {} );\r
+\r
+                               // Otherwise the filler is not needed anymore.\r
+                               else if ( fillerNode.name == 'br' )\r
+                                       children.splice( firstNestedListIndex - 1, 1 );\r
+                               else\r
+                                       fillerNode.value = fillerNode.value.replace( tailNbspRegex, '' );\r
+                       }\r
+\r
+               };\r
+       }\r
+\r
+       var defaultListDataFilterRules = { elements : {} };\r
+       for( var i in dtd.$listItem )\r
+               defaultListDataFilterRules.elements[ i ] = getExtendNestedListFilter();\r
+\r
+       var defaultListHtmlFilterRules = { elements : {} };\r
+       for( i in dtd.$listItem )\r
+               defaultListHtmlFilterRules.elements[ i ] = getExtendNestedListFilter( true );\r
+\r
        CKEDITOR.plugins.add( 'list',\r
        {\r
                init : function( editor )\r
@@ -565,6 +628,16 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, bulletedListCommand ) );\r
                },\r
 \r
+               afterInit : function ( editor )\r
+               {\r
+                       var dataProcessor = editor.dataProcessor;\r
+                       if( dataProcessor )\r
+                       {\r
+                               dataProcessor.dataFilter.addRules( defaultListDataFilterRules );\r
+                               dataProcessor.htmlFilter.addRules( defaultListHtmlFilterRules );\r
+                       }\r
+               },\r
+\r
                requires : [ 'domiterator' ]\r
        } );\r
 })();\r