X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fenterkey%2Fplugin.js;h=d9626a5b9c44695c51338121eb9bdbc6ec32cc70;hb=4e70ea24db840898be8cc21c950363a52a2a6aba;hp=1a79c516db4e03c42ebe6dc82043f032638899cd;hpb=4e90e78dc97789709ee7404359a5517540c27553;p=ckeditor.git diff --git a/_source/plugins/enterkey/plugin.js b/_source/plugins/enterkey/plugin.js index 1a79c51..d9626a5 100644 --- a/_source/plugins/enterkey/plugin.js +++ b/_source/plugins/enterkey/plugin.js @@ -11,9 +11,21 @@ For licensing, see LICENSE.html or http://ckeditor.com/license init : function( editor ) { - var specialKeys = editor.specialKeys; - specialKeys[ 13 ] = enter; - specialKeys[ CKEDITOR.SHIFT + 13 ] = shiftEnter; + editor.addCommand( 'enter', { + modes : { wysiwyg:1 }, + editorFocus : false, + exec : function( editor ){ enter( editor ); } + }); + + editor.addCommand( 'shiftEnter', { + modes : { wysiwyg:1 }, + editorFocus : false, + exec : function( editor ){ shiftEnter( editor ); } + }); + + var keystrokes = editor.keystrokeHandler.keystrokes; + keystrokes[ 13 ] = 'enter'; + keystrokes[ CKEDITOR.SHIFT + 13 ] = 'shiftEnter'; } }); @@ -31,18 +43,23 @@ For licensing, see LICENSE.html or http://ckeditor.com/license var doc = range.document; + var atBlockStart = range.checkStartOfBlock(), + atBlockEnd = range.checkEndOfBlock(), + path = new CKEDITOR.dom.elementPath( range.startContainer ), + block = path.block; + // Exit the list when we're inside an empty list item block. (#5376) - if ( range.checkStartOfBlock() && range.checkEndOfBlock() ) + if ( atBlockStart && atBlockEnd ) { - var path = new CKEDITOR.dom.elementPath( range.startContainer ), - block = path.block; - if ( block && ( block.is( 'li' ) || block.getParent().is( 'li' ) ) ) { editor.execCommand( 'outdent' ); return; } } + // Don't split
if we're in the middle of it, act as shift enter key. + else if ( !atBlockEnd && block && block.is( 'pre' ) ) + enterBr( editor, mode, range, forceMode ); // Determine the block element to be used. var blockTag = ( mode == CKEDITOR.ENTER_DIV ? 'div' : 'p' ); @@ -107,7 +124,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // Do not enter this block if it's a header tag, or we are in // a Shift+Enter (#77). Create a new block element instead // (later in the code). - if ( previousBlock.is( 'li' ) || !headerTagRegex.test( previousBlock.getName() ) ) + if ( previousBlock.is( 'li' ) || + ! ( headerTagRegex.test( previousBlock.getName() ) || previousBlock.is( 'pre' ) ) ) { // Otherwise, duplicate the previous block. newBlock = previousBlock.clone(); @@ -336,14 +354,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license // On SHIFT+ENTER: // 1. We want to enforce the mode to be respected, instead // of cloning the current block. (#77) - // 2. Always perform a block break when inside(#5402). - if ( editor.getSelection().getStartElement().hasAscendant( 'pre', true ) ) - { - setTimeout( function() { enterBlock( editor, editor.config.enterMode, null, true ); }, 0 ); - return true; - } - else - return enter( editor, editor.config.shiftEnterMode, 1 ); + return enter( editor, editor.config.shiftEnterMode, 1 ); } function enter( editor, mode, forceMode ) @@ -361,7 +372,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license setTimeout( function() { editor.fire( 'saveSnapshot' ); // Save undo step. - if ( mode == CKEDITOR.ENTER_BR || editor.getSelection().getStartElement().hasAscendant( 'pre', 1 ) ) + if ( mode == CKEDITOR.ENTER_BR ) enterBr( editor, mode, null, forceMode ); else enterBlock( editor, mode, null, forceMode );