X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=inline;f=_source%2Fplugins%2Fenterkey%2Fplugin.js;h=10b7e621004e3056502b2c8e43d1ff4792272bf6;hb=refs%2Ftags%2Fv3.2.2;hp=28dc2443dfb80b005c217c583e4196284eede79e;hpb=7cd80714081a8ffdf4a1a8d2c72f120ed5ef3d6d;p=ckeditor.git diff --git a/_source/plugins/enterkey/plugin.js b/_source/plugins/enterkey/plugin.js index 28dc244..10b7e62 100644 --- a/_source/plugins/enterkey/plugin.js +++ b/_source/plugins/enterkey/plugin.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -17,297 +17,325 @@ For licensing, see LICENSE.html or http://ckeditor.com/license } }); - var forceMode, - headerTagRegex = /^h[1-6]$/; - - function shiftEnter( editor ) + CKEDITOR.plugins.enterkey = { - // On SHIFT+ENTER we want to enforce the mode to be respected, instead - // of cloning the current block. (#77) - forceMode = 1; - - return enter( editor, editor.config.shiftEnterMode ); - } - - function enter( editor, mode ) - { - // Only effective within document. - if ( editor.mode != 'wysiwyg' ) - return false; + enterBlock : function( editor, mode, range, forceMode ) + { + // Get the range for the current selection. + range = range || getRange( editor ); - if ( !mode ) - mode = editor.config.enterMode; + var doc = range.document; - // Use setTimout so the keys get cancelled immediatelly. - setTimeout( function() + // Exit the list when we're inside an empty list item block. (#5376) + if ( range.checkStartOfBlock() && range.checkEndOfBlock() ) { - editor.fire( 'saveSnapshot' ); // Save undo step. - if ( mode == CKEDITOR.ENTER_BR || editor.getSelection().getStartElement().hasAscendant( 'pre', true ) ) - enterBr( editor, mode ); - else - enterBlock( editor, mode ); - - forceMode = 0; - }, 0 ); - - return true; - } - - function enterBlock( editor, mode, range ) - { - // Get the range for the current selection. - range = range || getRange( editor ); + var path = new CKEDITOR.dom.elementPath( range.startContainer ), + block = path.block; - var doc = range.document; + if ( block && ( block.is( 'li' ) || block.getParent().is( 'li' ) ) ) + { + editor.execCommand( 'outdent' ); + return; + } + } - // Determine the block element to be used. - var blockTag = ( mode == CKEDITOR.ENTER_DIV ? 'div' : 'p' ); + // Determine the block element to be used. + var blockTag = ( mode == CKEDITOR.ENTER_DIV ? 'div' : 'p' ); - // Split the range. - var splitInfo = range.splitBlock( blockTag ); + // Split the range. + var splitInfo = range.splitBlock( blockTag ); - if ( !splitInfo ) - return; + if ( !splitInfo ) + return; - // Get the current blocks. - var previousBlock = splitInfo.previousBlock, - nextBlock = splitInfo.nextBlock; + // Get the current blocks. + var previousBlock = splitInfo.previousBlock, + nextBlock = splitInfo.nextBlock; - var isStartOfBlock = splitInfo.wasStartOfBlock, - isEndOfBlock = splitInfo.wasEndOfBlock; + var isStartOfBlock = splitInfo.wasStartOfBlock, + isEndOfBlock = splitInfo.wasEndOfBlock; - var node; + var node; - // If this is a block under a list item, split it as well. (#1647) - if ( nextBlock ) - { - node = nextBlock.getParent(); - if ( node.is( 'li' ) ) + // If this is a block under a list item, split it as well. (#1647) + if ( nextBlock ) + { + node = nextBlock.getParent(); + if ( node.is( 'li' ) ) + { + nextBlock.breakParent( node ); + nextBlock.move( nextBlock.getNext(), true ); + } + } + else if ( previousBlock && ( node = previousBlock.getParent() ) && node.is( 'li' ) ) { - nextBlock.breakParent( node ); - nextBlock.move( nextBlock.getNext(), true ); + previousBlock.breakParent( node ); + range.moveToElementEditStart( previousBlock.getNext() ); + previousBlock.move( previousBlock.getPrevious() ); } - } - else if ( previousBlock && ( node = previousBlock.getParent() ) && node.is( 'li' ) ) - { - previousBlock.breakParent( node ); - range.moveToElementEditStart( previousBlock.getNext() ); - previousBlock.move( previousBlock.getPrevious() ); - } - // If we have both the previous and next blocks, it means that the - // boundaries were on separated blocks, or none of them where on the - // block limits (start/end). - if ( !isStartOfBlock && !isEndOfBlock ) - { - // If the next block is an
(#4711). + if ( isPre && !CKEDITOR.env.gecko ) + lineBreak = doc.createText( CKEDITOR.env.ie ? '\r' : '\n' ); + else + lineBreak = doc.createElement( 'br' ); - // Determine the block element to be used. - var blockTag = ( mode == CKEDITOR.ENTER_DIV ? 'div' : 'p' ); + range.deleteContents(); + range.insertNode( lineBreak ); + + // A text node is required by Gecko only to make the cursor blink. + // We need some text inside of it, so the bogus
is properly + // created. + if ( !CKEDITOR.env.ie ) + doc.createText( '\ufeff' ).insertAfter( lineBreak ); + + // If we are at the end of a block, we must be sure the bogus node is available in that block. + if ( isEndOfBlock && !CKEDITOR.env.ie ) + lineBreak.getParent().appendBogus(); + + // Now we can remove the text node contents, so the caret doesn't + // stop on it. + if ( !CKEDITOR.env.ie ) + lineBreak.getNext().$.nodeValue = ''; + // IE has different behavior regarding position. + if ( CKEDITOR.env.ie ) + range.setStartAt( lineBreak, CKEDITOR.POSITION_AFTER_END ); + else + range.setStartAt( lineBreak.getNext(), CKEDITOR.POSITION_AFTER_START ); - var isEndOfBlock = range.checkEndOfBlock(); + // Scroll into view, for non IE. + if ( !CKEDITOR.env.ie ) + { + var dummy = null; - var elementPath = new CKEDITOR.dom.elementPath( editor.getSelection().getStartElement() ); + // BR is not positioned in Opera and Webkit. + if ( !CKEDITOR.env.gecko ) + { + dummy = doc.createElement( 'span' ); + // We need have some contents for Webkit to position it + // under parent node. ( #3681) + dummy.setHtml(' '); + } + else + dummy = doc.createElement( 'br' ); - var startBlock = elementPath.block, - startBlockTag = startBlock && elementPath.block.getName(); + dummy.insertBefore( lineBreak.getNext() ); + dummy.scrollIntoView(); + dummy.remove(); + } + } - var isPre = false; + // This collapse guarantees the cursor will be blinking. + range.collapse( true ); - if ( !forceMode && startBlockTag == 'li' ) - { - enterBlock( editor, mode, range ); - return; + range.select( isPre ); } + }; - // If we are at the end of a header block. - if ( !forceMode && isEndOfBlock && headerTagRegex.test( startBlockTag ) ) - { - // Insert a
after the current paragraph. - doc.createElement( 'br' ).insertAfter( startBlock ); + var plugin = CKEDITOR.plugins.enterkey, + enterBr = plugin.enterBr, + enterBlock = plugin.enterBlock, + headerTagRegex = /^h[1-6]$/; - // A text node is required by Gecko only to make the cursor blink. - if ( CKEDITOR.env.gecko ) - doc.createText( '' ).insertAfter( startBlock ); + function shiftEnter( editor ) + { + // Only effective within document. + if ( editor.mode != 'wysiwyg' ) + return false; - // IE has different behaviors regarding position. - range.setStartAt( startBlock.getNext(), CKEDITOR.env.ie ? CKEDITOR.POSITION_BEFORE_START : CKEDITOR.POSITION_AFTER_START ); + // 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 - { - var lineBreak; - - isPre = ( startBlockTag == 'pre' ); - - if ( isPre ) - lineBreak = doc.createText( CKEDITOR.env.ie ? '\r' : '\n' ); - else - lineBreak = doc.createElement( 'br' ); - - range.deleteContents(); - range.insertNode( lineBreak ); + return enter( editor, editor.config.shiftEnterMode, true ); + } - // A text node is required by Gecko only to make the cursor blink. - // We need some text inside of it, so the bogus
is properly - // created. - if ( !CKEDITOR.env.ie ) - doc.createText( '\ufeff' ).insertAfter( lineBreak ); + function enter( editor, mode, forceMode ) + { + forceMode = editor.config.forceEnterMode || forceMode; - // If we are at the end of a block, we must be sure the bogus node is available in that block. - if ( isEndOfBlock && !CKEDITOR.env.ie ) - lineBreak.getParent().appendBogus(); + // Only effective within document. + if ( editor.mode != 'wysiwyg' ) + return false; - // Now we can remove the text node contents, so the caret doesn't - // stop on it. - if ( !CKEDITOR.env.ie ) - lineBreak.getNext().$.nodeValue = ''; - // IE has different behavior regarding position. - if ( CKEDITOR.env.ie ) - range.setStartAt( lineBreak, CKEDITOR.POSITION_AFTER_END ); - else - range.setStartAt( lineBreak.getNext(), CKEDITOR.POSITION_AFTER_START ); + if ( !mode ) + mode = editor.config.enterMode; - // Scroll into view, for non IE. - if ( !CKEDITOR.env.ie ) + // Use setTimout so the keys get cancelled immediatelly. + setTimeout( function() { - var dummy = null; - - // BR is not positioned in Opera and Webkit. - if ( !CKEDITOR.env.gecko ) - { - dummy = doc.createElement( 'span' ); - // We need have some contents for Webkit to position it - // under parent node. ( #3681) - dummy.setHtml(' '); - } + editor.fire( 'saveSnapshot' ); // Save undo step. + if ( mode == CKEDITOR.ENTER_BR || editor.getSelection().getStartElement().hasAscendant( 'pre', true ) ) + enterBr( editor, mode, null, forceMode ); else - dummy = doc.createElement( 'br' ); - - dummy.insertBefore( lineBreak.getNext() ); - dummy.scrollIntoView(); - dummy.remove(); - } - } + enterBlock( editor, mode, null, forceMode ); - // This collapse guarantees the cursor will be blinking. - range.collapse( true ); + }, 0 ); - range.select( isPre ); + return true; } + function getRange( editor ) { // Get the selection ranges.