X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Flist%2Fplugin.js;h=b0d5e8cf63103dd8f58b52da3e361eb19b99c780;hb=refs%2Ftags%2Fv3.4.1;hp=0a55231edd833f99507b870a8f62039501ba24ed;hpb=e7789c1ad838194d45eeee6ac2eb6e55f5cf35a1;p=ckeditor.git
diff --git a/_source/plugins/list/plugin.js b/_source/plugins/list/plugin.js
index 0a55231..b0d5e8c 100644
--- a/_source/plugins/list/plugin.js
+++ b/_source/plugins/list/plugin.js
@@ -67,7 +67,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
},
// Convert our internal representation of a list back to a DOM forest.
- arrayToList : function( listArray, database, baseIndex, paragraphMode )
+ arrayToList : function( listArray, database, baseIndex, paragraphMode, dir )
{
if ( !baseIndex )
baseIndex = 0;
@@ -109,8 +109,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
else
{
// Create completely new blocks here, attributes are dropped.
- if ( paragraphMode != CKEDITOR.ENTER_BR && item.grandparent.getName() != 'td' )
+ if ( dir || ( paragraphMode != CKEDITOR.ENTER_BR && item.grandparent.getName() != 'td' ) )
+ {
currentListItem = doc.createElement( paragraphName );
+ if ( dir )
+ currentListItem.setAttribute( 'dir', dir );
+ }
else
currentListItem = new CKEDITOR.dom.documentFragment( doc );
}
@@ -218,7 +222,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
CKEDITOR.dom.element.setMarker( database, itemNode, 'list_item_processed', true );
}
- var fakeParent = groupObj.root.getDocument().createElement( this.type );
+ var root = groupObj.root,
+ fakeParent = root.getDocument().createElement( this.type );
+ // Copy all attributes, except from 'start' and 'type'.
+ root.copyAttributes( fakeParent, { start : 1, type : 1 } );
+ // The list-style-type property should be ignored.
+ fakeParent.removeStyle( 'list-style-type' );
+
for ( i = 0 ; i < selectedListItems.length ; i++ )
{
var listIndex = selectedListItems[i].getCustomData( 'listarray_index' );
@@ -234,6 +244,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
newList.listNode.replace( groupObj.root );
}
+ var headerTagRegex = /^h[1-6]$/;
+
function createList( editor, groupObj, listsCreated )
{
var contents = groupObj.contents,
@@ -278,21 +290,40 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// Insert the list to the DOM tree.
var insertAnchor = listContents[ listContents.length - 1 ].getNext(),
- listNode = doc.createElement( this.type );
+ listNode = doc.createElement( this.type ),
+ dir;
listsCreated.push( listNode );
while ( listContents.length )
{
var contentBlock = listContents.shift(),
listItem = doc.createElement( 'li' );
- contentBlock.moveChildren( listItem );
- contentBlock.remove();
- listItem.appendTo( listNode );
- // Append a bogus BR to force the LI to render at full height
- if ( !CKEDITOR.env.ie )
- listItem.appendBogus();
+ // Preserve preformat block and heading structure when converting to list item. (#5335) (#5271)
+ if ( contentBlock.is( 'pre' ) || headerTagRegex.test( contentBlock.getName() ) )
+ contentBlock.appendTo( listItem );
+ else
+ {
+ if ( contentBlock.hasAttribute( 'dir' ) )
+ {
+ dir = dir || contentBlock.getAttribute( 'dir' );
+ contentBlock.removeAttribute( 'dir' );
+ }
+ contentBlock.copyAttributes( listItem );
+ contentBlock.moveChildren( listItem );
+ contentBlock.remove();
+
+ // Append a bogus BR to force the LI to render at full height
+ if ( !CKEDITOR.env.ie )
+ listItem.appendBogus();
+ }
+
+ listItem.appendTo( listNode );
}
+
+ if ( dir )
+ listNode.setAttribute( 'dir', dir );
+
if ( insertAnchor )
listNode.insertBefore( insertAnchor );
else
@@ -342,7 +373,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
}
}
- var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode );
+ var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode,
+ groupObj.root.getAttribute( 'dir' ) );
// Compensate
before/after the list node if the surrounds are non-blocks.(#3836)
var docFragment = newList.listNode, boundaryNode, siblingNode;
@@ -374,7 +406,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
var doc = editor.document,
selection = editor.getSelection(),
- ranges = selection && selection.getRanges();
+ ranges = selection && selection.getRanges( true );
// There should be at least one selected range.
if ( !ranges || ranges.length < 1 )
@@ -392,7 +424,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
var paragraph = doc.createElement( editor.config.enterMode == CKEDITOR.ENTER_P ? 'p' :
( editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'br' ) );
paragraph.appendTo( body );
- ranges = [ new CKEDITOR.dom.range( doc ) ];
+ ranges = new CKEDITOR.dom.rangeList( [ new CKEDITOR.dom.range( doc ) ] );
// IE exception on inserting anything when anchor inside
.
if ( paragraph.is( 'br' ) )
{
@@ -422,12 +454,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// Group the blocks up because there are many cases where multiple lists have to be created,
// or multiple lists have to be cancelled.
var listGroups = [],
- database = {};
+ database = {},
+ rangeIterator = ranges.createIterator(),
+ index = 0;
- while ( ranges.length > 0 )
+ while ( ( range = rangeIterator.getNextRange() ) && ++index )
{
- range = ranges.shift();
-
var boundaryNodes = range.getBoundaryNodes(),
startNode = boundaryNodes.startNode,
endNode = boundaryNodes.endNode;
@@ -445,6 +477,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
while ( ( block = iterator.getNextParagraph() ) )
{
+ // Avoid duplicate blocks get processed across ranges.
+ if( block.getCustomData( 'list_block' ) )
+ continue;
+ else
+ CKEDITOR.dom.element.setMarker( database, block, 'list_block', 1 );
+
var path = new CKEDITOR.dom.elementPath( block ),
pathElements = path.elements,
pathElementsCount = pathElements.length,
@@ -464,7 +502,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// no longer be valid. Since paragraphs after the list
// should belong to a different group of paragraphs before
// the list. (Bug #1309)
- blockLimit.removeCustomData( 'list_group_object' );
+ blockLimit.removeCustomData( 'list_group_object_' + index );
var groupObj = element.getCustomData( 'list_group_object' );
if ( groupObj )
@@ -483,14 +521,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
if ( processedFlag )
continue;
- // No list ancestor? Group by block limit.
+ // No list ancestor? Group by block limit, but don't mix contents from different ranges.
var root = blockLimit;
- if ( root.getCustomData( 'list_group_object' ) )
- root.getCustomData( 'list_group_object' ).contents.push( block );
+ if ( root.getCustomData( 'list_group_object_' + index ) )
+ root.getCustomData( 'list_group_object_' + index ).contents.push( block );
else
{
groupObj = { root : root, contents : [ block ] };
- CKEDITOR.dom.element.setMarker( database, root, 'list_group_object', groupObj );
+ CKEDITOR.dom.element.setMarker( database, root, 'list_group_object_' + index, groupObj );
listGroups.push( groupObj );
}
}
@@ -524,7 +562,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
var sibling = listNode[ rtl ?
'getPrevious' : 'getNext' ]( CKEDITOR.dom.walker.whitespaces( true ) );
if ( sibling && sibling.getName &&
- sibling.getName() == listCommand.type )
+ sibling.getName() == listCommand.type )
{
sibling.remove();
// Move children order by merge direction.(#3820)