X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=_source%2Fplugins%2Fwysiwygarea%2Fplugin.js;h=7e7c1923a659a47d66c21bb6c22005ab9ef4fd22;hb=e371ddf8abcb89013e20e6d0dd746adec344d0e5;hp=11fd76eb32f24108b9fcfd03ab6f95e94fb58a04;hpb=c6e377a02b54abc07129d72b632763c727476a15;p=ckeditor.git
diff --git a/_source/plugins/wysiwygarea/plugin.js b/_source/plugins/wysiwygarea/plugin.js
index 11fd76e..7e7c192 100644
--- a/_source/plugins/wysiwygarea/plugin.js
+++ b/_source/plugins/wysiwygarea/plugin.js
@@ -14,17 +14,30 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
var nonExitableElementNames = { table:1,pre:1 };
// Matching an empty paragraph at the end of document.
- var emptyParagraphRegexp = /\s*<(p|div|address|h\d|center)[^>]*>\s*(?:
]*>| |\u00A0| )?\s*(:?<\/\1>)?\s*(?=$|<\/body>)/gi;
+ var emptyParagraphRegexp = /\s*<(p|div|address|h\d|center|li)[^>]*>\s*(?:
]*>| |\u00A0| )?\s*(:?<\/\1>)?\s*(?=$|<\/body>)/gi;
+
+ var notWhitespaceEval = CKEDITOR.dom.walker.whitespaces( true );
+
+ function checkReadOnly( selection )
+ {
+ if ( selection.getType() == CKEDITOR.SELECTION_ELEMENT )
+ return selection.getSelectedElement().isReadOnly();
+ else
+ return selection.getCommonAncestor().isReadOnly();
+ }
function onInsertHtml( evt )
{
if ( this.mode == 'wysiwyg' )
{
this.focus();
- this.fire( 'saveSnapshot' );
- var selection = this.getSelection(),
- data = evt.data;
+ var selection = this.getSelection();
+ if ( checkReadOnly( selection ) )
+ return;
+
+ var data = evt.data;
+ this.fire( 'saveSnapshot' );
if ( this.dataProcessor )
data = this.dataProcessor.toHtml( data );
@@ -37,8 +50,29 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
selection.unlock();
var $sel = selection.getNative();
+
+ // Delete control selections to avoid IE bugs on pasteHTML.
if ( $sel.type == 'Control' )
$sel.clear();
+ else if ( selection.getType() == CKEDITOR.SELECTION_TEXT )
+ {
+ // Due to IE bugs on handling contenteditable=false blocks
+ // (#6005), we need to make some checks and eventually
+ // delete the selection first.
+
+ var range = selection.getRanges()[0],
+ endContainer = range && range.endContainer;
+
+ if ( endContainer &&
+ endContainer.type == CKEDITOR.NODE_ELEMENT &&
+ endContainer.getAttribute( 'contenteditable' ) == 'false' &&
+ range.checkBoundaryOfElement( endContainer, CKEDITOR.END ) )
+ {
+ range.setEndAfter( range.endContainer );
+ range.deleteContents();
+ }
+ }
+
$sel.createRange().pasteHTML( data );
if ( selIsLocked )
@@ -47,6 +81,15 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
else
this.document.$.execCommand( 'inserthtml', false, data );
+ // Webkit does not scroll to the cursor position after pasting (#5558)
+ if ( CKEDITOR.env.webkit )
+ {
+ this.document.$.execCommand( 'inserthtml', false, '' );
+ var marker = this.document.getById( 'cke_paste_marker' );
+ marker.scrollIntoView();
+ marker.remove();
+ }
+
CKEDITOR.tools.setTimeout( function()
{
this.fire( 'saveSnapshot' );
@@ -59,15 +102,18 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
if ( this.mode == 'wysiwyg' )
{
this.focus();
+
+ var selection = this.getSelection();
+ if ( checkReadOnly( selection ) )
+ return;
+
this.fire( 'saveSnapshot' );
- var element = evt.data,
+ var ranges = selection.getRanges(),
+ element = evt.data,
elementName = element.getName(),
isBlock = CKEDITOR.dtd.$block[ elementName ];
- var selection = this.getSelection(),
- ranges = selection.getRanges();
-
var selIsLocked = selection.isLocked;
if ( selIsLocked )
@@ -121,9 +167,17 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
range.moveToPosition( lastElement, CKEDITOR.POSITION_AFTER_END );
- var next = lastElement.getNextSourceNode( true );
- if ( next && next.type == CKEDITOR.NODE_ELEMENT )
- range.moveToElementEditStart( next );
+ // If we're inserting a block element immediatelly followed by
+ // another block element, the selection must move there. (#3100,#5436)
+ if ( isBlock )
+ {
+ var next = lastElement.getNext( notWhitespaceEval ),
+ nextName = next && next.type == CKEDITOR.NODE_ELEMENT && next.getName();
+
+ // Check if it's a block element that accepts text.
+ if ( nextName && CKEDITOR.dtd.$block[ nextName ] && CKEDITOR.dtd[ nextName ]['#'] )
+ range.moveToElementEditStart( next );
+ }
selection.selectRanges( [ range ] );
@@ -161,6 +215,50 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
&& CKEDITOR.tools.trim( node.getText() ).match( /^(?: |\xa0)$/ );
}
+ function restoreSelection( selection )
+ {
+ if ( selection.isLocked )
+ {
+ selection.unlock();
+ setTimeout( function() { selection.lock(); }, 0 );
+ }
+ }
+
+ function isBlankParagraph( block )
+ {
+ return block.getOuterHtml().match( emptyParagraphRegexp );
+ }
+
+ isNotWhitespace = CKEDITOR.dom.walker.whitespaces( true );
+
+ // Gecko need a key event to 'wake up' the editing
+ // ability when document is empty.(#3864, #5781)
+ function activateEditing( editor )
+ {
+ var win = editor.window,
+ doc = editor.document,
+ body = editor.document.getBody(),
+ bodyChildsNum = body.getChildren().count();
+
+ if ( !bodyChildsNum || ( bodyChildsNum == 1&& body.getFirst().hasAttribute( '_moz_editor_bogus_node' ) ) )
+ {
+ restoreDirty( editor );
+
+ // Simulating keyboard character input by dispatching a keydown of white-space text.
+ var keyEventSimulate = doc.$.createEvent( "KeyEvents" );
+ keyEventSimulate.initKeyEvent( 'keypress', true, true, win.$, false,
+ false, false, false, 0, 32 );
+ doc.$.dispatchEvent( keyEventSimulate );
+
+ // Restore the original document status by placing the cursor before a bogus br created (#5021).
+ bodyChildsNum && body.getFirst().remove();
+ doc.getBody().appendBogus();
+ var nativeRange = new CKEDITOR.dom.range( doc );
+ nativeRange.setStartAt( body , CKEDITOR.POSITION_AFTER_START );
+ nativeRange.select();
+ }
+ }
+
/**
* Auto-fixing block-less content by wrapping paragraph (#3190), prevent
* non-exitable-block by padding extra br.(#3189)
@@ -175,6 +273,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
body = editor.document.getBody(),
enterMode = editor.config.enterMode;
+ CKEDITOR.env.gecko && activateEditing( editor );
+
// When enterMode set to block, we'll establing new paragraph only if we're
// selecting inline contents right under body. (#3657)
if ( enterMode != CKEDITOR.ENTER_BR
@@ -182,7 +282,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
&& blockLimit.getName() == 'body'
&& !path.block )
{
+ editor.fire( 'updateSnapshot' );
restoreDirty( editor );
+ CKEDITOR.env.ie && restoreSelection( selection );
+
var fixedBlock = range.fixBlock( true,
editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' );
@@ -193,23 +296,29 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
first && isNbsp( first ) && first.remove();
}
- // If the fixed block is blank and already followed by a exitable
- // block, we should revert the fix. (#3684)
- if ( fixedBlock.getOuterHtml().match( emptyParagraphRegexp ) )
+ // If the fixed block is actually blank and is already followed by an exitable blank
+ // block, we should revert the fix and move into the existed one. (#3684)
+ if ( isBlankParagraph( fixedBlock ) )
{
- var previousElement = fixedBlock.getPrevious( isNotWhitespace ),
- nextElement = fixedBlock.getNext( isNotWhitespace );
-
-
- if ( previousElement && previousElement.getName
- && !( previousElement.getName() in nonExitableElementNames )
- && range.moveToElementEditStart( previousElement )
- || nextElement && nextElement.getName
- && !( nextElement.getName() in nonExitableElementNames )
- && range.moveToElementEditStart( nextElement ) )
+ var element = fixedBlock.getNext( isNotWhitespace );
+ if ( element &&
+ element.type == CKEDITOR.NODE_ELEMENT &&
+ !nonExitableElementNames[ element.getName() ] )
{
+ range.moveToElementEditStart( element );
fixedBlock.remove();
}
+ else
+ {
+ element = fixedBlock.getPrevious( isNotWhitespace );
+ if ( element &&
+ element.type == CKEDITOR.NODE_ELEMENT &&
+ !nonExitableElementNames[ element.getName() ] )
+ {
+ range.moveToElementEditEnd( element );
+ fixedBlock.remove();
+ }
+ }
}
range.select();
@@ -221,14 +330,32 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// All browsers are incapable to moving cursor out of certain non-exitable
// blocks (e.g. table, list, pre) at the end of document, make this happen by
// place a bogus node there, which would be later removed by dataprocessor.
- var lastNode = body.getLast( CKEDITOR.dom.walker.whitespaces( true ) );
- if ( lastNode && lastNode.getName && ( lastNode.getName() in nonExitableElementNames ) )
+ var walkerRange = new CKEDITOR.dom.range( editor.document ),
+ walker = new CKEDITOR.dom.walker( walkerRange );
+ walkerRange.selectNodeContents( body );
+ walker.evaluator = function( node )
+ {
+ return node.type == CKEDITOR.NODE_ELEMENT && ( node.getName() in nonExitableElementNames );
+ };
+ walker.guard = function( node, isMoveout )
{
+ return !( ( node.type == CKEDITOR.NODE_TEXT && isNotWhitespace( node ) ) || isMoveout );
+ };
+
+ if ( walker.previous() )
+ {
+ editor.fire( 'updateSnapshot' );
restoreDirty( editor );
- if ( !CKEDITOR.env.ie )
- body.appendBogus();
+ CKEDITOR.env.ie && restoreSelection( selection );
+
+ var paddingBlock;
+ if ( enterMode != CKEDITOR.ENTER_BR )
+ paddingBlock = body.append( new CKEDITOR.dom.element( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) );
else
- body.append( editor.document.createText( '\xa0' ) );
+ paddingBlock = body;
+
+ if ( !CKEDITOR.env.ie )
+ paddingBlock.appendBogus();
}
}
@@ -241,16 +368,19 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
var fixForBody = ( editor.config.enterMode != CKEDITOR.ENTER_BR )
? editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' : false;
+ var frameLabel = editor.lang.editorTitle.replace( '%1', editor.name );
+
+ var contentDomReadyHandler;
editor.on( 'editingBlockReady', function()
{
var mainElement,
- fieldset,
iframe,
isLoadingData,
isPendingFocus,
frameLoaded,
fireMode;
+
// Support for custom document.domain in IE.
var isCustomDomain = CKEDITOR.env.isCustomDomain();
@@ -259,99 +389,71 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
{
if ( iframe )
iframe.remove();
- if ( fieldset )
- fieldset.remove();
- frameLoaded = 0;
+
+ var srcScript =
+ 'document.open();' +
+
+ // The document domain must be set any time we
+ // call document.open().
+ ( isCustomDomain ? ( 'document.domain="' + document.domain + '";' ) : '' ) +
+
+ 'document.close();';
iframe = CKEDITOR.dom.element.createFromHtml( '' );
- // Register onLoad event for iframe element, which
- // will fill it with content and set custom domain.
- iframe.on( 'load', function( e )
- {
- e.removeListener();
- var doc = iframe.getFrameDocument().$;
+ // #5689 Running inside of Firefox chrome the load event doesn't bubble like in a normal page
+ if (document.location.protocol == 'chrome:')
+ CKEDITOR.event.useCapture = true;
- // Custom domain handling is needed after each document.open().
- doc.open();
- if ( isCustomDomain )
- doc.domain = document.domain;
- doc.write( data );
- doc.close();
+ // With FF, it's better to load the data on iframe.load. (#3894,#4058)
+ iframe.on( 'load', function( ev )
+ {
+ frameLoaded = 1;
+ ev.removeListener();
- } );
+ var doc = iframe.getFrameDocument().$;
- var accTitle = editor.lang.editorTitle.replace( '%1', editor.name );
+ // Don't leave any history log in IE. (#5657)
+ doc.open( "text/html","replace" );
+ doc.write( data );
+ doc.close();
+ });
- if ( CKEDITOR.env.gecko )
- {
- // Accessibility attributes for Firefox.
- mainElement.setAttributes(
- {
- role : 'region',
- title : accTitle
- } );
- iframe.setAttributes(
- {
- role : 'region',
- title : ' '
- } );
- }
- else if ( CKEDITOR.env.webkit )
- {
- iframe.setAttribute( 'title', accTitle ); // Safari 4
- iframe.setAttribute( 'name', accTitle ); // Safari 3
- }
- else if ( CKEDITOR.env.ie )
- {
- // Accessibility label for IE.
- fieldset = CKEDITOR.dom.element.createFromHtml(
- '