X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fenterkey%2Fplugin.js;h=dac6fb293e8e6ca88a88028fbbfb0741fcc1fcf4;hb=fb481ba0a7d298e3e7b9034fcb9f2afdc6e8e796;hp=d9626a5b9c44695c51338121eb9bdbc6ec32cc70;hpb=4e70ea24db840898be8cc21c950363a52a2a6aba;p=ckeditor.git diff --git a/_source/plugins/enterkey/plugin.js b/_source/plugins/enterkey/plugin.js index d9626a5..dac6fb2 100644 --- a/_source/plugins/enterkey/plugin.js +++ b/_source/plugins/enterkey/plugin.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -48,18 +48,47 @@ For licensing, see LICENSE.html or http://ckeditor.com/license path = new CKEDITOR.dom.elementPath( range.startContainer ), block = path.block; - // Exit the list when we're inside an empty list item block. (#5376) if ( atBlockStart && atBlockEnd ) { + // Exit the list when we're inside an empty list item block. (#5376) if ( block && ( block.is( 'li' ) || block.getParent().is( 'li' ) ) ) { editor.execCommand( 'outdent' ); return; } + + if ( block && block.getParent().is( 'blockquote' ) ) + { + block.breakParent( block.getParent() ); + + // If we were at the start of
, there will be an empty element before it now. + if ( !block.getPrevious().getFirst( CKEDITOR.dom.walker.invisible(1) ) ) + block.getPrevious().remove(); + + // If we were at the end of, there will be an empty element after it now. + if ( !block.getNext().getFirst( CKEDITOR.dom.walker.invisible(1) ) ) + block.getNext().remove(); + + range.moveToElementEditStart( block ); + range.select(); + return; + } } // Don't splitif we're in the middle of it, act as shift enter key. - else if ( !atBlockEnd && block && block.is( 'pre' ) ) + else if ( block && block.is( 'pre' ) ) + { + if ( !atBlockEnd ) + { + enterBr( editor, mode, range, forceMode ); + return; + } + } + // Don't split caption blocks. (#7944) + else if ( block && CKEDITOR.dtd.$captionBlock[ block.getName() ] ) + { enterBr( editor, mode, range, forceMode ); + return; + } // Determine the block element to be used. var blockTag = ( mode == CKEDITOR.ENTER_DIV ? 'div' : 'p' ); @@ -129,8 +158,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license { // Otherwise, duplicate the previous block. newBlock = previousBlock.clone(); - // Value attribute of list item should not be duplicated (#7330). - newBlock.is( 'li' ) && newBlock.removeAttribute( 'value' ); } } else if ( nextBlock ) @@ -180,6 +207,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license if ( !newBlock.getParent() ) range.insertNode( newBlock ); + // list item start number should not be duplicated (#7330), but we need + // to remove the attribute after it's onto the DOM tree because of old IEs (#7581). + newBlock.is( 'li' ) && newBlock.removeAttribute( 'value' ); + // This is tricky, but to make the new block visible correctly // we must select it. // The previousBlock check has been included because it may be @@ -372,11 +403,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license setTimeout( function() { editor.fire( 'saveSnapshot' ); // Save undo step. + if ( mode == CKEDITOR.ENTER_BR ) enterBr( editor, mode, null, forceMode ); else enterBlock( editor, mode, null, forceMode ); + editor.fire( 'saveSnapshot' ); + }, 0 ); return true;