X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fplugins%2Fenterkey%2Fplugin.js;h=0127ede7f1afb7089c554ddc6324facdfd7a6259;hp=28dc2443dfb80b005c217c583e4196284eede79e;hb=941b0a9ba4e673e292510d80a5a86806994b8ea6;hpb=7cd80714081a8ffdf4a1a8d2c72f120ed5ef3d6d diff --git a/_source/plugins/enterkey/plugin.js b/_source/plugins/enterkey/plugin.js index 28dc244..0127ede 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,301 @@ 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; + enterBlock : function( editor, mode, range, forceMode ) + { + // Get the range for the current selection. + range = range || getRange( editor ); - return enter( editor, editor.config.shiftEnterMode ); - } + var doc = range.document; - function enter( editor, mode ) - { - // Only effective within document. - if ( editor.mode != 'wysiwyg' ) - return false; + // Determine the block element to be used. + var blockTag = ( mode == CKEDITOR.ENTER_DIV ? 'div' : 'p' ); - if ( !mode ) - mode = editor.config.enterMode; + // Split the range. + var splitInfo = range.splitBlock( blockTag ); - // Use setTimout so the keys get cancelled immediatelly. - setTimeout( function() - { - editor.fire( 'saveSnapshot' ); // Save undo step. - if ( mode == CKEDITOR.ENTER_BR || editor.getSelection().getStartElement().hasAscendant( 'pre', true ) ) - enterBr( editor, mode ); - else - enterBlock( editor, mode ); + if ( !splitInfo ) + return; - forceMode = 0; - }, 0 ); + // Get the current blocks. + var previousBlock = splitInfo.previousBlock, + nextBlock = splitInfo.nextBlock; - return true; - } + var isStartOfBlock = splitInfo.wasStartOfBlock, + isEndOfBlock = splitInfo.wasEndOfBlock; - function enterBlock( editor, mode, range ) - { - // Get the range for the current selection. - range = range || getRange( editor ); + var node; - var doc = range.document; + // 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' ) ) + { + previousBlock.breakParent( node ); + range.moveToElementEditStart( previousBlock.getNext() ); + previousBlock.move( previousBlock.getPrevious() ); + } - // Determine the block element to be used. - var blockTag = ( mode == CKEDITOR.ENTER_DIV ? 'div' : 'p' ); + // 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
  • with another list tree as the first + // 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( 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 ) + range.moveToElementEditStart( nextBlock ); + } + else + { - // Split the range. - var splitInfo = range.splitBlock( blockTag ); + if ( isStartOfBlock && isEndOfBlock && previousBlock.is( 'li' ) ) + { + editor.execCommand( 'outdent' ); + return; + } - if ( !splitInfo ) - return; + var newBlock; - // Get the current blocks. - var previousBlock = splitInfo.previousBlock, - nextBlock = splitInfo.nextBlock; + if ( previousBlock ) + { + // 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 ( !forceMode && !headerTagRegex.test( previousBlock.getName() ) ) + { + // Otherwise, duplicate the previous block. + newBlock = previousBlock.clone(); + } + } + else if ( nextBlock ) + newBlock = nextBlock.clone(); - var isStartOfBlock = splitInfo.wasStartOfBlock, - isEndOfBlock = splitInfo.wasEndOfBlock; + if ( !newBlock ) + newBlock = doc.createElement( blockTag ); - var node; + // Recreate the inline elements tree, which was available + // before hitting enter, so the same styles will be available in + // the new block. + var elementPath = splitInfo.elementPath; + if ( elementPath ) + { + for ( var i = 0, len = elementPath.elements.length ; i < len ; i++ ) + { + var element = elementPath.elements[ i ]; - // 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' ) ) - { - previousBlock.breakParent( node ); - range.moveToElementEditStart( previousBlock.getNext() ); - previousBlock.move( previousBlock.getPrevious() ); - } + if ( element.equals( elementPath.block ) || element.equals( elementPath.blockLimit ) ) + break; - // 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
  • with another list tree as the first - // 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( 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 ) - range.moveToElementEditStart( nextBlock ); - } - else - { + if ( CKEDITOR.dtd.$removeEmpty[ element.getName() ] ) + { + element = element.clone(); + newBlock.moveChildren( element ); + newBlock.append( element ); + } + } + } - if ( isStartOfBlock && isEndOfBlock && previousBlock.is( 'li' ) ) - { - editor.execCommand( 'outdent' ); - return; - } + if ( !CKEDITOR.env.ie ) + newBlock.appendBogus(); - var newBlock; + range.insertNode( newBlock ); - if ( previousBlock ) - { - // 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 ( !forceMode && !headerTagRegex.test( previousBlock.getName() ) ) + // 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 + // empty if we have fixed a block-less space (like ENTER into an + // empty table cell). + if ( CKEDITOR.env.ie && isStartOfBlock && ( !isEndOfBlock || !previousBlock.getChildCount() ) ) { - // Otherwise, duplicate the previous block. - newBlock = previousBlock.clone(); + // Move the selection to the new block. + range.moveToElementEditStart( isEndOfBlock ? previousBlock : newBlock ); + range.select(); } - } - else if ( nextBlock ) - newBlock = nextBlock.clone(); - if ( !newBlock ) - newBlock = doc.createElement( blockTag ); + // Move the selection to the new block. + range.moveToElementEditStart( isStartOfBlock && !isEndOfBlock ? nextBlock : newBlock ); + } - // Recreate the inline elements tree, which was available - // before hitting enter, so the same styles will be available in - // the new block. - var elementPath = splitInfo.elementPath; - if ( elementPath ) + if ( !CKEDITOR.env.ie ) { - for ( var i = 0, len = elementPath.elements.length ; i < len ; i++ ) + if ( nextBlock ) { - var element = elementPath.elements[ i ]; + // If we have split the block, adds a temporary span at the + // range position and scroll relatively to it. + var tmpNode = doc.createElement( 'span' ); - if ( element.equals( elementPath.block ) || element.equals( elementPath.blockLimit ) ) - break; + // We need some content for Safari. + tmpNode.setHtml( ' ' ); - if ( CKEDITOR.dtd.$removeEmpty[ element.getName() ] ) - { - element = element.clone(); - newBlock.moveChildren( element ); - newBlock.append( element ); - } + range.insertNode( tmpNode ); + tmpNode.scrollIntoView(); + range.deleteContents(); + } + else + { + // We may use the above scroll logic for the new block case + // too, but it gives some weird result with Opera. + newBlock.scrollIntoView(); } } - if ( !CKEDITOR.env.ie ) - newBlock.appendBogus(); + range.select(); + }, + + enterBr : function( editor, mode, range, forceMode ) + { + // Get the range for the current selection. + range = range || getRange( editor ); + + var doc = range.document; + + // Determine the block element to be used. + var blockTag = ( mode == CKEDITOR.ENTER_DIV ? 'div' : 'p' ); + + var isEndOfBlock = range.checkEndOfBlock(); + + var elementPath = new CKEDITOR.dom.elementPath( editor.getSelection().getStartElement() ); + + var startBlock = elementPath.block, + startBlockTag = startBlock && elementPath.block.getName(); - range.insertNode( newBlock ); + var isPre = false; - // 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 - // empty if we have fixed a block-less space (like ENTER into an - // empty table cell). - if ( CKEDITOR.env.ie && isStartOfBlock && ( !isEndOfBlock || !previousBlock.getChildCount() ) ) + if ( !forceMode && startBlockTag == 'li' ) { - // Move the selection to the new block. - range.moveToElementEditStart( isEndOfBlock ? previousBlock : newBlock ); - range.select(); + enterBlock( editor, mode, range, forceMode ); + return; } - // Move the selection to the new block. - range.moveToElementEditStart( isStartOfBlock && !isEndOfBlock ? nextBlock : newBlock ); - } - - if ( !CKEDITOR.env.ie ) - { - if ( nextBlock ) + // If we are at the end of a header block. + if ( !forceMode && isEndOfBlock && headerTagRegex.test( startBlockTag ) ) { - // If we have split the block, adds a temporary span at the - // range position and scroll relatively to it. - var tmpNode = doc.createElement( 'span' ); + // Insert a
    after the current paragraph. + doc.createElement( 'br' ).insertAfter( startBlock ); - // We need some content for Safari. - tmpNode.setHtml( ' ' ); + // A text node is required by Gecko only to make the cursor blink. + if ( CKEDITOR.env.gecko ) + doc.createText( '' ).insertAfter( startBlock ); - range.insertNode( tmpNode ); - tmpNode.scrollIntoView(); - range.deleteContents(); + // IE has different behaviors regarding position. + range.setStartAt( startBlock.getNext(), CKEDITOR.env.ie ? CKEDITOR.POSITION_BEFORE_START : CKEDITOR.POSITION_AFTER_START ); } else { - // We may use the above scroll logic for the new block case - // too, but it gives some weird result with Opera. - newBlock.scrollIntoView(); - } - } + var lineBreak; - range.select(); - } + isPre = ( startBlockTag == 'pre' ); - function enterBr( editor, mode ) - { - // Get the range for the current selection. - var range = getRange( editor ), - doc = range.document; + if ( isPre ) + 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 ); - - // A text node is required by Gecko only to make the cursor blink. - if ( CKEDITOR.env.gecko ) - doc.createText( '' ).insertAfter( startBlock ); - - // IE has different behaviors regarding position. - range.setStartAt( startBlock.getNext(), CKEDITOR.env.ie ? CKEDITOR.POSITION_BEFORE_START : CKEDITOR.POSITION_AFTER_START ); - } - 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 ); + 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. - // We need some text inside of it, so the bogus
    is properly - // created. - if ( !CKEDITOR.env.ie ) - doc.createText( '\ufeff' ).insertAfter( lineBreak ); + function shiftEnter( editor ) + { + // On SHIFT+ENTER we want to enforce the mode to be respected, instead + // of cloning the current block. (#77) + return enter( editor, editor.config.shiftEnterMode, true ); + } - // 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(); + function enter( editor, mode, forceMode ) + { + // 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.