X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fenterkey%2Fplugin.js;h=8a38916510fd3c8e7fb5c7e6e32e35e18a897239;hb=a272c66d841421f8bf933c16535bdcde1c4649fc;hp=59a4f8226bc8cc6f7079f903b48427ade1a37daa;hpb=f0610347140239143439a511ee2bd48cb784f470;p=ckeditor.git diff --git a/_source/plugins/enterkey/plugin.js b/_source/plugins/enterkey/plugin.js index 59a4f82..8a38916 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-2013, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -48,14 +48,31 @@ 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 ( block && block.is( 'pre' ) ) @@ -298,9 +315,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license isPre = ( startBlockTag == 'pre' ); - // Gecko prefers
as line-break inside(#4711). - if ( isPre && !CKEDITOR.env.gecko ) - lineBreak = doc.createText( CKEDITOR.env.ie ? '\r' : '\n' ); + // IE<8 prefers text node as line-break inside of(#4711). + if ( startBlockTag == 'pre' && CKEDITOR.env.ie && CKEDITOR.env.version < 8 ) + lineBreak = doc.createText( '\r' ); else lineBreak = doc.createElement( 'br' ); @@ -386,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;