X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fenterkey%2Fplugin.js;h=28dc2443dfb80b005c217c583e4196284eede79e;hb=refs%2Ftags%2Fv3.0.2;hp=d171ae25df78b28ed09d2c13fc7e7e4ba3e18254;hpb=8761695d9b70afe75905deaac88f78c1f8aeb32d;p=ckeditor.git diff --git a/_source/plugins/enterkey/plugin.js b/_source/plugins/enterkey/plugin.js index d171ae2..28dc244 100644 --- a/_source/plugins/enterkey/plugin.js +++ b/_source/plugins/enterkey/plugin.js @@ -101,11 +101,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license if ( !isStartOfBlock && !isEndOfBlock ) { // If the next block is an
  • with another list tree as the first - // child, we'll need to append a placeholder or the list item + // child, we'll need to append a filler (
    /NBSP) or the list item // wouldn't be editable. (#1420) - if ( nextBlock.is( 'li' ) && ( node = nextBlock.getFirst() ) - && node.is && node.is( 'ul', 'ol') ) - nextBlock.insertBefore( doc.createText( '\xa0' ), node ); + if ( nextBlock.is( 'li' ) + && ( node = nextBlock.getFirst( CKEDITOR.dom.walker.invisible( true ) ) ) + && node.is && node.is( 'ul', 'ol' ) ) + ( CKEDITOR.env.ie ? doc.createText( '\xa0' ) : doc.createElement( 'br' ) ).insertBefore( node ); // Move the selection to the end block. if ( nextBlock )