X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fwysiwygarea%2Fplugin.js;h=d837ea7afe4cb0852f96eb10a3d80e7363ce2e2c;hb=4e70ea24db840898be8cc21c950363a52a2a6aba;hp=5a0aca8a52abf45008298dbc85dc4a19ee8b63b7;hpb=66f4ae0bf0280ed56bf7c0f4ab175424dd1d47a0;p=ckeditor.git
diff --git a/_source/plugins/wysiwygarea/plugin.js b/_source/plugins/wysiwygarea/plugin.js
index 5a0aca8..d837ea7 100644
--- a/_source/plugins/wysiwygarea/plugin.js
+++ b/_source/plugins/wysiwygarea/plugin.js
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
@@ -10,141 +10,266 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
(function()
{
- // List of elements in which has no way to move editing focus outside.
- 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|pre)[^>]*>\s*(?:
]*>| |\u00A0| )?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi;
+
+ var notWhitespaceEval = CKEDITOR.dom.walker.whitespaces( true );
- function onInsertHtml( evt )
+ // Elements that could blink the cursor anchoring beside it, like hr, page-break. (#6554)
+ function nonEditable( element )
{
- if ( this.mode == 'wysiwyg' )
+ return element.isBlockBoundary() && CKEDITOR.dtd.$empty[ element.getName() ];
+ }
+
+
+ function onInsert( insertFunc )
+ {
+ return function( evt )
{
- this.focus();
- this.fire( 'saveSnapshot' );
+ if ( this.mode == 'wysiwyg' )
+ {
+ this.focus();
- var selection = this.getSelection(),
- data = evt.data;
+ this.fire( 'saveSnapshot' );
- if ( this.dataProcessor )
- data = this.dataProcessor.toHtml( data );
+ insertFunc.call( this, evt.data );
- if ( CKEDITOR.env.ie )
+ // Save snaps after the whole execution completed.
+ // This's a workaround for make DOM modification's happened after
+ // 'insertElement' to be included either, e.g. Form-based dialogs' 'commitContents'
+ // call.
+ CKEDITOR.tools.setTimeout( function()
+ {
+ this.fire( 'saveSnapshot' );
+ }, 0, this );
+ }
+ };
+ }
+
+ function doInsertHtml( data )
+ {
+ if ( this.dataProcessor )
+ data = this.dataProcessor.toHtml( data );
+
+ // HTML insertion only considers the first range.
+ var selection = this.getSelection(),
+ range = selection.getRanges()[ 0 ];
+
+ if ( range.checkReadOnly() )
+ return;
+
+ if ( CKEDITOR.env.ie )
+ {
+ var selIsLocked = selection.isLocked;
+
+ if ( selIsLocked )
+ 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 )
{
- var selIsLocked = selection.isLocked;
+ // Due to IE bugs on handling contenteditable=false blocks
+ // (#6005), we need to make some checks and eventually
+ // delete the selection first.
- if ( selIsLocked )
- selection.unlock();
+ range = selection.getRanges()[ 0 ];
+ var endContainer = range && range.endContainer;
- var $sel = selection.getNative();
- if ( $sel.type == 'Control' )
- $sel.clear();
- $sel.createRange().pasteHTML( data );
+ if ( endContainer &&
+ endContainer.type == CKEDITOR.NODE_ELEMENT &&
+ endContainer.getAttribute( 'contenteditable' ) == 'false' &&
+ range.checkBoundaryOfElement( endContainer, CKEDITOR.END ) )
+ {
+ range.setEndAfter( range.endContainer );
+ range.deleteContents();
+ }
+ }
- if ( selIsLocked )
- this.getSelection().lock();
+ try
+ {
+ $sel.createRange().pasteHTML( data );
}
- else
- this.document.$.execCommand( 'inserthtml', false, data );
+ catch (e) {}
- CKEDITOR.tools.setTimeout( function()
- {
- this.fire( 'saveSnapshot' );
- }, 0, this );
+ if ( selIsLocked )
+ this.getSelection().lock();
+ }
+ else
+ this.document.$.execCommand( 'inserthtml', false, data );
+
+ // Webkit does not scroll to the cursor position after pasting (#5558)
+ if ( CKEDITOR.env.webkit )
+ {
+ selection = this.getSelection();
+ selection.scrollIntoView();
}
}
- function onInsertElement( evt )
+ function doInsertText( text )
{
- if ( this.mode == 'wysiwyg' )
- {
- this.focus();
- this.fire( 'saveSnapshot' );
+ var selection = this.getSelection(),
+ mode = selection.getStartElement().hasAscendant( 'pre', true ) ?
+ CKEDITOR.ENTER_BR : this.config.enterMode,
+ isEnterBrMode = mode == CKEDITOR.ENTER_BR;
- var element = evt.data,
- elementName = element.getName(),
- isBlock = CKEDITOR.dtd.$block[ elementName ];
+ var html = CKEDITOR.tools.htmlEncode( text.replace( /\r\n|\r/g, '\n' ) );
- var selection = this.getSelection(),
- ranges = selection.getRanges();
+ // Convert leading and trailing whitespaces into
+ html = html.replace( /^[ \t]+|[ \t]+$/g, function( match, offset, s )
+ {
+ if ( match.length == 1 ) // one space, preserve it
+ return ' ';
+ else if ( !offset ) // beginning of block
+ return CKEDITOR.tools.repeat( ' ', match.length - 1 ) + ' ';
+ else // end of block
+ return ' ' + CKEDITOR.tools.repeat( ' ', match.length - 1 );
+ } );
+
+ // Convert subsequent whitespaces into
+ html = html.replace( /[ \t]{2,}/g, function ( match )
+ {
+ return CKEDITOR.tools.repeat( ' ', match.length - 1 ) + ' ';
+ } );
+
+ var paragraphTag = mode == CKEDITOR.ENTER_P ? 'p' : 'div';
+
+ // Two line-breaks create one paragraph.
+ if ( !isEnterBrMode )
+ {
+ html = html.replace( /(\n{2})([\s\S]*?)(?:$|\1)/g,
+ function( match, group1, text )
+ {
+ return '<'+paragraphTag + '>' + text + '' + paragraphTag + '>';
+ });
+ }
- var selIsLocked = selection.isLocked;
+ // One
per line-break.
+ html = html.replace( /\n/g, '
' );
- if ( selIsLocked )
- selection.unlock();
+ // Compensate padding
for non-IE.
+ if ( !( isEnterBrMode || CKEDITOR.env.ie ) )
+ {
+ html = html.replace( new RegExp( '
(?=' + paragraphTag + '>)' ), function( match )
+ {
+ return CKEDITOR.tools.repeat( match, 2 );
+ } );
+ }
- var range, clone, lastElement, bookmark;
+ // Inline styles have to be inherited in Firefox.
+ if ( CKEDITOR.env.gecko || CKEDITOR.env.webkit )
+ {
+ var path = new CKEDITOR.dom.elementPath( selection.getStartElement() ),
+ context = [];
- for ( var i = ranges.length - 1 ; i >= 0 ; i-- )
+ for ( var i = 0; i < path.elements.length; i++ )
{
- range = ranges[ i ];
+ var tag = path.elements[ i ].getName();
+ if ( tag in CKEDITOR.dtd.$inline )
+ context.unshift( path.elements[ i ].getOuterHtml().match( /^<.*?>/) );
+ else if ( tag in CKEDITOR.dtd.$block )
+ break;
+ }
- // Remove the original contents.
- range.deleteContents();
+ // Reproduce the context by preceding the pasted HTML with opening inline tags.
+ html = context.join( '' ) + html;
+ }
- clone = !i && element || element.clone( true );
+ doInsertHtml.call( this, html );
+ }
- // If we're inserting a block at dtd-violated position, split
- // the parent blocks until we reach blockLimit.
- var current, dtd;
- if ( isBlock )
+ function doInsertElement( element )
+ {
+ var selection = this.getSelection(),
+ ranges = selection.getRanges(),
+ elementName = element.getName(),
+ isBlock = CKEDITOR.dtd.$block[ elementName ];
+
+ var selIsLocked = selection.isLocked;
+
+ if ( selIsLocked )
+ selection.unlock();
+
+ var range, clone, lastElement, bookmark;
+
+ for ( var i = ranges.length - 1 ; i >= 0 ; i-- )
+ {
+ range = ranges[ i ];
+
+ if ( !range.checkReadOnly() )
{
- while ( ( current = range.getCommonAncestor( false, true ) )
- && ( dtd = CKEDITOR.dtd[ current.getName() ] )
- && !( dtd && dtd [ elementName ] ) )
+ // Remove the original contents, merge splitted nodes.
+ range.deleteContents( 1 );
+
+ clone = !i && element || element.clone( 1 );
+
+ // If we're inserting a block at dtd-violated position, split
+ // the parent blocks until we reach blockLimit.
+ var current, dtd;
+ if ( isBlock )
{
- // Split up inline elements.
- if ( current.getName() in CKEDITOR.dtd.span )
- range.splitElement( current );
- // If we're in an empty block which indicate a new paragraph,
- // simply replace it with the inserting block.(#3664)
- else if ( range.checkStartOfBlock()
- && range.checkEndOfBlock() )
+ while ( ( current = range.getCommonAncestor( 0, 1 ) )
+ && ( dtd = CKEDITOR.dtd[ current.getName() ] )
+ && !( dtd && dtd [ elementName ] ) )
{
- range.setStartBefore( current );
- range.collapse( true );
- current.remove();
+ // Split up inline elements.
+ if ( current.getName() in CKEDITOR.dtd.span )
+ range.splitElement( current );
+ // If we're in an empty block which indicate a new paragraph,
+ // simply replace it with the inserting block.(#3664)
+ else if ( range.checkStartOfBlock()
+ && range.checkEndOfBlock() )
+ {
+ range.setStartBefore( current );
+ range.collapse( true );
+ current.remove();
+ }
+ else
+ range.splitBlock();
}
- else
- range.splitBlock();
}
- }
- // Insert the new node.
- range.insertNode( clone );
+ // Insert the new node.
+ range.insertNode( clone );
- // Save the last element reference so we can make the
- // selection later.
- if ( !lastElement )
- lastElement = clone;
+ // Save the last element reference so we can make the
+ // selection later.
+ if ( !lastElement )
+ lastElement = clone;
+ }
}
- range.moveToPosition( lastElement, CKEDITOR.POSITION_AFTER_END );
+ if ( lastElement )
+ {
+ 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();
- selection.selectRanges( [ range ] );
+ // Check if it's a block element that accepts text.
+ if ( nextName && CKEDITOR.dtd.$block[ nextName ] && CKEDITOR.dtd[ nextName ]['#'] )
+ range.moveToElementEditStart( next );
+ }
+ }
- if ( selIsLocked )
- this.getSelection().lock();
+ selection.selectRanges( [ range ] );
- // Save snaps after the whole execution completed.
- // This's a workaround for make DOM modification's happened after
- // 'insertElement' to be included either, e.g. Form-based dialogs' 'commitContents'
- // call.
- CKEDITOR.tools.setTimeout( function(){
- this.fire( 'saveSnapshot' );
- }, 0, this );
- }
+ if ( selIsLocked )
+ this.getSelection().lock();
}
// DOM modification here should not bother dirty flag.(#4385)
function restoreDirty( editor )
{
if ( !editor.checkDirty() )
- setTimeout( function(){ editor.resetDirty(); } );
+ setTimeout( function(){ editor.resetDirty(); }, 0 );
}
var isNotWhitespace = CKEDITOR.dom.walker.whitespaces( true ),
@@ -177,6 +302,47 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
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(),
+ bodyFirstChild = body.getFirst(),
+ bodyChildsNum = body.getChildren().count();
+
+ if ( !bodyChildsNum
+ || bodyChildsNum == 1
+ && bodyFirstChild.type == CKEDITOR.NODE_ELEMENT
+ && bodyFirstChild.hasAttribute( '_moz_editor_bogus_node' ) )
+ {
+ restoreDirty( editor );
+
+ // Memorize scroll position to restore it later (#4472).
+ var hostDocument = editor.element.getDocument();
+ var hostDocumentElement = hostDocument.getDocumentElement();
+ var scrollTop = hostDocumentElement.$.scrollTop;
+ var scrollLeft = hostDocumentElement.$.scrollLeft;
+
+ // 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 );
+
+ if ( scrollTop != hostDocumentElement.$.scrollTop || scrollLeft != hostDocumentElement.$.scrollLeft )
+ hostDocument.getWindow().$.scrollTo( scrollLeft, scrollTop );
+
+ // 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)
@@ -191,12 +357,37 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
body = editor.document.getBody(),
enterMode = editor.config.enterMode;
- // 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
- && range.collapsed
- && blockLimit.getName() == 'body'
- && !path.block )
+ if ( CKEDITOR.env.gecko )
+ {
+ activateEditing( editor );
+
+ // Ensure bogus br could help to move cursor (out of styles) to the end of block. (#7041)
+ var pathBlock = path.block || path.blockLimit,
+ lastNode = pathBlock && pathBlock.getLast( isNotEmpty );
+
+ // Check some specialities of the current path block:
+ // 1. It is really displayed as block; (#7221)
+ // 2. It doesn't end with one inner block; (#7467)
+ // 3. It doesn't have bogus br yet.
+ if ( pathBlock
+ && pathBlock.isBlockBoundary()
+ && !( lastNode && lastNode.type == CKEDITOR.NODE_ELEMENT && lastNode.isBlockBoundary() )
+ && !pathBlock.is( 'pre' )
+ && !pathBlock.getBogus() )
+ {
+ editor.fire( 'updateSnapshot' );
+ restoreDirty( editor );
+ pathBlock.appendBogus();
+ }
+ }
+
+ // When we're in block enter mode, a new paragraph will be established
+ // to encapsulate inline contents right under body. (#3657)
+ if ( editor.config.autoParagraph !== false
+ && enterMode != CKEDITOR.ENTER_BR
+ && range.collapsed
+ && blockLimit.getName() == 'body'
+ && !path.block )
{
editor.fire( 'updateSnapshot' );
restoreDirty( editor );
@@ -216,44 +407,39 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// 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 )
- && isBlankParagraph( previousElement )
- && range.moveToElementEditStart( previousElement )
- || nextElement && nextElement.getName
- && !( nextElement.getName() in nonExitableElementNames )
- && isBlankParagraph( nextElement )
- && range.moveToElementEditStart( nextElement ) )
+ var element = fixedBlock.getNext( isNotWhitespace );
+ if ( element &&
+ element.type == CKEDITOR.NODE_ELEMENT &&
+ !nonEditable( element ) )
{
+ range.moveToElementEditStart( element );
fixedBlock.remove();
}
+ else
+ {
+ element = fixedBlock.getPrevious( isNotWhitespace );
+ if ( element &&
+ element.type == CKEDITOR.NODE_ELEMENT &&
+ !nonEditable( element ) )
+ {
+ range.moveToElementEditEnd( element );
+ fixedBlock.remove();
+ }
+ }
}
range.select();
- // Notify non-IE that selection has changed.
- if ( !CKEDITOR.env.ie )
- editor.selectionChange();
+ // Cancel this selection change in favor of the next (correct). (#6811)
+ evt.cancel();
}
- // 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 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() )
+ // Browsers are incapable of moving cursor out of certain block elements (e.g. table, div, pre)
+ // at the end of document, makes it unable to continue adding content, we have to make this
+ // easier by opening an new empty paragraph.
+ var testRange = new CKEDITOR.dom.range( editor.document );
+ testRange.moveToElementEditEnd( editor.document.getBody() );
+ var testPath = new CKEDITOR.dom.elementPath( testRange.startContainer );
+ if ( !testPath.blockLimit.is( 'body') )
{
editor.fire( 'updateSnapshot' );
restoreDirty( editor );
@@ -261,7 +447,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
var paddingBlock;
if ( enterMode != CKEDITOR.ENTER_BR )
- paddingBlock = body.append( new CKEDITOR.dom.element( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) );
+ paddingBlock = body.append( editor.document.createElement( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) );
else
paddingBlock = body;
@@ -276,7 +462,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
init : function( editor )
{
- var fixForBody = ( editor.config.enterMode != CKEDITOR.ENTER_BR )
+ var fixForBody = ( editor.config.enterMode != CKEDITOR.ENTER_BR && editor.config.autoParagraph !== false )
? editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' : false;
var frameLabel = editor.lang.editorTitle.replace( '%1', editor.name );
@@ -301,8 +487,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
if ( iframe )
iframe.remove();
-
- var srcScript =
+ var src =
'document.open();' +
// The document domain must be set any time we
@@ -311,40 +496,77 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
'document.close();';
+ // With IE, the custom domain has to be taken care at first,
+ // for other browers, the 'src' attribute should be left empty to
+ // trigger iframe's 'load' event.
+ src =
+ CKEDITOR.env.air ?
+ 'javascript:void(0)' :
+ CKEDITOR.env.ie ?
+ 'javascript:void(function(){' + encodeURIComponent( src ) + '}())'
+ :
+ '';
+
iframe = CKEDITOR.dom.element.createFromHtml( '' );
+ // Running inside of Firefox chrome the load event doesn't bubble like in a normal page (#5689)
+ if ( document.location.protocol == 'chrome:' )
+ CKEDITOR.event.useCapture = true;
+
// 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().$;
-
- // Don't leave any history log in IE. (#5657)
- doc.open( "text/html","replace" );
+ var doc = iframe.getFrameDocument();
doc.write( data );
- doc.close();
+
+ CKEDITOR.env.air && contentDomReady( doc.getWindow().$ );
});
+ // Reset adjustment back to default (#5689)
+ if ( document.location.protocol == 'chrome:' )
+ CKEDITOR.event.useCapture = false;
+
+ // The container must be visible when creating the iframe in FF (#5956)
+ var element = editor.element,
+ isHidden = CKEDITOR.env.gecko && !element.isVisible(),
+ previousStyles = {};
+ if ( isHidden )
+ {
+ element.show();
+ previousStyles = {
+ position : element.getStyle( 'position' ),
+ top : element.getStyle( 'top' )
+ };
+ element.setStyles( { position : 'absolute', top : '-3000px' } );
+ }
+
mainElement.append( iframe );
+
+ if ( isHidden )
+ {
+ setTimeout( function()
+ {
+ element.hide();
+ element.setStyles( previousStyles );
+ }, 1000 );
+ }
};
// The script that launches the bootstrap logic on 'domReady', so the document
// is fully editable even before the editing iframe is fully loaded (#4455).
contentDomReadyHandler = CKEDITOR.tools.addFunction( contentDomReady );
var activationScript =
- '';
@@ -363,10 +585,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// Remove this script from the DOM.
var script = domDocument.getElementById( "cke_actscrpt" );
- script.parentNode.removeChild( script );
+ script && script.parentNode.removeChild( script );
body.spellcheck = !editor.config.disableNativeSpellChecker;
+ var editable = !editor.readOnly;
+
if ( CKEDITOR.env.ie )
{
// Don't display the focus border.
@@ -375,7 +599,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// Disable and re-enable the body to avoid IE from
// taking the editing focus at startup. (#141 / #523)
body.disabled = true;
- body.contentEditable = true;
+ body.contentEditable = editable;
body.removeAttribute( 'disabled' );
}
else
@@ -387,46 +611,20 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// Prefer 'contentEditable' instead of 'designMode'. (#3593)
if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900
|| CKEDITOR.env.opera )
- domDocument.$.body.contentEditable = true;
+ domDocument.$.body.contentEditable = editable;
else if ( CKEDITOR.env.webkit )
- domDocument.$.body.parentNode.contentEditable = true;
+ domDocument.$.body.parentNode.contentEditable = editable;
else
- domDocument.$.designMode = 'on';
+ domDocument.$.designMode = editable? 'off' : 'on';
}, 0 );
}
- // Gecko need a key event to 'wake up' the editing
- // ability when document is empty.(#3864)
- if ( CKEDITOR.env.gecko && !body.childNodes.length )
- {
- setTimeout( function()
- {
- restoreDirty( editor );
-
- // Simulating keyboard character input by dispatching a keydown of white-space text.
- var keyEventSimulate = domDocument.$.createEvent( "KeyEvents" );
- keyEventSimulate.initKeyEvent( 'keypress', true, true, domWindow.$, false,
- false, false, false, 0, 32 );
- domDocument.$.dispatchEvent( keyEventSimulate );
-
- // Restore the original document status by placing the cursor before a bogus br created (#5021).
- domDocument.createElement( 'br', { attributes: { '_moz_editor_bogus_node' : 'TRUE', '_moz_dirty' : "" } } )
- .replace( domDocument.getBody().getFirst() );
- var nativeRange = new CKEDITOR.dom.range( domDocument );
- nativeRange.setStartAt( new CKEDITOR.dom.element( body ) , CKEDITOR.POSITION_AFTER_START );
- nativeRange.select();
- }, 0 );
- }
+ editable && CKEDITOR.env.gecko && CKEDITOR.tools.setTimeout( activateEditing, 0, null, editor );
- // IE, Opera and Safari may not support it and throw
- // errors.
- try { domDocument.execCommand( 'enableObjectResizing', false, !editor.config.disableObjectResizing ) ; } catch(e) {}
- try { domDocument.execCommand( 'enableInlineTableEditing', false, !editor.config.disableNativeTableHandles ) ; } catch(e) {}
-
- domWindow = editor.window = new CKEDITOR.dom.window( domWindow );
+ domWindow = editor.window = new CKEDITOR.dom.window( domWindow );
domDocument = editor.document = new CKEDITOR.dom.document( domDocument );
- domDocument.on( 'dblclick', function( evt )
+ editable && domDocument.on( 'dblclick', function( evt )
{
var element = evt.data.getTarget(),
data = { element : element, dialog : '' };
@@ -434,8 +632,20 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
data.dialog && editor.openDialog( data.dialog );
});
+ // Prevent automatic submission in IE #6336
+ CKEDITOR.env.ie && domDocument.on( 'click', function( evt )
+ {
+ var element = evt.data.getTarget();
+ if ( element.is( 'input' ) )
+ {
+ var type = element.getAttribute( 'type' );
+ if ( type == 'submit' || type == 'reset' )
+ evt.data.preventDefault();
+ }
+ });
+
// Gecko/Webkit need some help when selecting control type elements. (#3448)
- if ( !( CKEDITOR.env.ie || CKEDITOR.env.opera) )
+ if ( !( CKEDITOR.env.ie || CKEDITOR.env.opera ) )
{
domDocument.on( 'mousedown', function( ev )
{
@@ -445,9 +655,39 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
} );
}
+ if ( CKEDITOR.env.gecko )
+ {
+ domDocument.on( 'mouseup', function( ev )
+ {
+ if ( ev.data.$.button == 2 )
+ {
+ var target = ev.data.getTarget();
+
+ // Prevent right click from selecting an empty block even
+ // when selection is anchored inside it. (#5845)
+ if ( !target.getOuterHtml().replace( emptyParagraphRegexp, '' ) )
+ {
+ var range = new CKEDITOR.dom.range( domDocument );
+ range.moveToElementEditStart( target );
+ range.select( true );
+ }
+ }
+ } );
+ }
+
+ // Prevent the browser opening links in read-only blocks. (#6032)
+ domDocument.on( 'click', function( ev )
+ {
+ ev = ev.data;
+ if ( ev.getTarget().is( 'a' ) && ev.$.button != 2 )
+ ev.preventDefault();
+ });
+
// Webkit: avoid from editing form control elements content.
if ( CKEDITOR.env.webkit )
{
+ // Mark that cursor will right blinking (#7113).
+ domDocument.on( 'mousedown', function() { wasFocused = 1; } );
// Prevent from tick checkbox/radiobox/select
domDocument.on( 'click', function( ev )
{
@@ -465,8 +705,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// IE standard compliant in editing frame doesn't focus the editor when
// clicking outside actual content, manually apply the focus. (#1659)
- if ( CKEDITOR.env.ie
- && domDocument.$.compatMode == 'CSS1Compat'
+ if ( editable &&
+ CKEDITOR.env.ie && domDocument.$.compatMode == 'CSS1Compat'
|| CKEDITOR.env.gecko
|| CKEDITOR.env.opera )
{
@@ -485,44 +725,46 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
} );
}
- domWindow.on( 'blur', function()
+ var focusTarget = CKEDITOR.env.ie ? iframe : domWindow;
+ focusTarget.on( 'blur', function()
{
editor.focusManager.blur();
});
- domWindow.on( 'focus', function()
+ var wasFocused;
+
+ focusTarget.on( 'focus', function()
{
var doc = editor.document;
- if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 )
+ if ( editable && CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 )
blinkCursor();
else if ( CKEDITOR.env.opera )
doc.getBody().focus();
+ // Webkit needs focus for the first time on the HTML element. (#6153)
else if ( CKEDITOR.env.webkit )
{
- // Selection will get lost after move focus
- // to document element, save it first.
- var sel = editor.getSelection(),
- type = sel.getType(),
- range = ( type != CKEDITOR.SELECTION_NONE ) && sel.getRanges()[ 0 ];
-
- doc.getDocumentElement().focus();
- range && range.select();
+ if ( !wasFocused )
+ {
+ editor.document.getDocumentElement().focus();
+ wasFocused = 1;
+ }
}
editor.focusManager.focus();
});
var keystrokeHandler = editor.keystrokeHandler;
- if ( keystrokeHandler )
- keystrokeHandler.attach( domDocument );
+ // Prevent backspace from navigating off the page.
+ keystrokeHandler.blockedKeystrokes[ 8 ] = !editable;
+ keystrokeHandler.attach( domDocument );
if ( CKEDITOR.env.ie )
{
domDocument.getDocumentElement().addClass( domDocument.$.compatMode );
// Override keystrokes which should have deletion behavior
// on control types in IE . (#4047)
- domDocument.on( 'keydown', function( evt )
+ editable && domDocument.on( 'keydown', function( evt )
{
var keyCode = evt.data.getKeystroke();
@@ -567,6 +809,30 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
}
} );
}
+
+ // Prevent IE from leaving new paragraph after deleting all contents in body. (#6966)
+ editor.config.enterMode != CKEDITOR.ENTER_P
+ && domDocument.on( 'selectionchange', function()
+ {
+ var body = domDocument.getBody(),
+ range = editor.getSelection().getRanges()[ 0 ];
+
+ if ( body.getHtml().match( /^ <\/p>$/i )
+ && range.startContainer.equals( body ) )
+ {
+ // Avoid the ambiguity from a real user cursor position.
+ setTimeout( function ()
+ {
+ range = editor.getSelection().getRanges()[ 0 ];
+ if ( !range.startContainer.equals ( 'body' ) )
+ {
+ body.getFirst().remove( 1 );
+ range.moveToElementEditEnd( body );
+ range.select( 1 );
+ }
+ }, 0 );
+ }
+ });
}
// Adds the document body as a context menu target.
@@ -596,6 +862,24 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
editor.fire( 'dataReady' );
}, 0 );
+ // IE, Opera and Safari may not support it and throw errors.
+ try { editor.document.$.execCommand( 'enableInlineTableEditing', false, !editor.config.disableNativeTableHandles ); } catch(e) {}
+ if ( editor.config.disableObjectResizing )
+ {
+ try
+ {
+ editor.document.$.execCommand( 'enableObjectResizing', false, false );
+ }
+ catch(e)
+ {
+ // For browsers in which the above method failed, we can cancel the resizing on the fly (#4208)
+ editor.document.getBody().on( CKEDITOR.env.ie ? 'resizestart' : 'resize', function( evt )
+ {
+ evt.data.preventDefault();
+ });
+ }
+ }
+
/*
* IE BUG: IE might have rendered the iframe with invisible contents.
* (#3623). Push some inconsequential CSS style changes to force IE to
@@ -644,6 +928,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
loadData : function( data )
{
isLoadingData = true;
+ editor._.dataStore = { id : 1 };
var config = editor.config,
fullPage = config.fullPage,
@@ -651,7 +936,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// Build the additional stuff to be included into
.
var headExtra =
- '';
@@ -659,7 +944,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
CKEDITOR.tools.buildStyleHtml( editor.config.contentsCss ) +
headExtra );
- var baseTag = config.baseHref ? '' : '';
+ var baseTag = config.baseHref ? '' : '';
if ( fullPage )
{
@@ -668,6 +953,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
{
editor.docType = docType = match;
return '';
+ }).replace( /<\?xml\s[^\?]*\?>/i, function( match )
+ {
+ editor.xmlDeclaration = match;
+ return '';
});
}
@@ -723,6 +1012,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
'';
}
+ // Distinguish bogus to normal BR at the end of document for Mozilla. (#5293).
+ if ( CKEDITOR.env.gecko )
+ data = data.replace( /
(?=\s*<\/(:?html|body)>)/, '$&
' );
+
data += activationScript;
@@ -736,19 +1029,26 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
var config = editor.config,
fullPage = config.fullPage,
docType = fullPage && editor.docType,
+ xmlDeclaration = fullPage && editor.xmlDeclaration,
doc = iframe.getFrameDocument();
var data = fullPage
? doc.getDocumentElement().getOuterHtml()
: doc.getBody().getHtml();
+ // BR at the end of document is bogus node for Mozilla. (#5293).
+ if ( CKEDITOR.env.gecko )
+ data = data.replace( /
(?=\s*(:?$|<\/body>))/, '' );
+
if ( editor.dataProcessor )
data = editor.dataProcessor.toDataFormat( data, fixForBody );
- // Strip the last blank paragraph within document.
+ // Reset empty if the document contains only one empty paragraph.
if ( config.ignoreEmptyParagraph )
- data = data.replace( emptyParagraphRegexp, '' );
+ data = data.replace( emptyParagraphRegexp, function( match, lookback ) { return lookback; } );
+ if ( xmlDeclaration )
+ data = xmlDeclaration + '\n' + data;
if ( docType )
data = docType + '\n' + data;
@@ -777,6 +1077,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
editor.document.clearCustomData();
iframe.clearCustomData();
+
+ /*
+ * IE BUG: When destroying editor DOM with the selection remains inside
+ * editing area would break IE7/8's selection system, we have to put the editing
+ * iframe offline first. (#3812 and #5441)
+ */
+ iframe.remove();
},
unload : function( holderElement )
@@ -790,19 +1097,33 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
focus : function()
{
+ var win = editor.window;
+
if ( isLoadingData )
isPendingFocus = true;
- else if ( editor.window )
+ // Temporary solution caused by #6025, supposed be unified by #6154.
+ else if ( CKEDITOR.env.opera && editor.document )
{
- editor.window.focus();
+ // Required for Opera when switching focus
+ // from another iframe, e.g. panels. (#6444)
+ var iframe = editor.window.$.frameElement;
+ iframe.blur(), iframe.focus();
+ editor.document.getBody().focus();
editor.selectionChange();
}
+ else if ( !CKEDITOR.env.opera && win )
+ {
+ // AIR needs a while to focus when moving from a link.
+ CKEDITOR.env.air ? setTimeout( function () { win.focus(); }, 0 ) : win.focus();
+ editor.selectionChange();
+ }
}
});
- editor.on( 'insertHtml', onInsertHtml, null, null, 20 );
- editor.on( 'insertElement', onInsertElement, null, null, 20 );
+ editor.on( 'insertHtml', onInsert( doInsertHtml ) , null, null, 20 );
+ editor.on( 'insertElement', onInsert( doInsertElement ), null, null, 20 );
+ editor.on( 'insertText', onInsert( doInsertText ), null, null, 20 );
// Auto fixing on some document structure weakness to enhance usabilities. (#3190 and #3189)
editor.on( 'selectionChange', onSelectionChangeFixBody, null, null, 1 );
});
@@ -810,16 +1131,26 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
var titleBackup;
// Setting voice label as window title, backup the original one
// and restore it before running into use.
- editor.on( 'contentDom', function ()
+ editor.on( 'contentDom', function()
{
var title = editor.document.getElementsByTag( 'title' ).getItem( 0 );
- title.setAttribute( '_cke_title', editor.document.$.title );
+ title.data( 'cke-title', editor.document.$.title );
editor.document.$.title = frameLabel;
});
- // IE8 stricts mode doesn't have 'contentEditable' in effect
+ editor.on( 'readOnly', function()
+ {
+ if ( editor.mode == 'wysiwyg' )
+ {
+ // Symply reload the wysiwyg area. It'll take care of read-only.
+ var wysiwyg = editor.getMode();
+ wysiwyg.loadData( wysiwyg.getData() );
+ }
+ });
+
+ // IE>=8 stricts mode doesn't have 'contentEditable' in effect
// on element unless it has layout. (#5562)
- if ( CKEDITOR.env.ie8Compat )
+ if ( CKEDITOR.document.$.documentMode >= 8 )
{
editor.addCss( 'html.CSS1Compat [contenteditable=false]{ min-height:0 !important;}' );
@@ -828,18 +1159,36 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
selectors.push( 'html.CSS1Compat ' + tag + '[contenteditable=false]' );
editor.addCss( selectors.join( ',' ) + '{ display:inline-block;}' );
}
+ // Set the HTML style to 100% to have the text cursor in affect (#6341)
+ else if ( CKEDITOR.env.gecko )
+ {
+ editor.addCss( 'html { height: 100% !important; }' );
+ editor.addCss( 'img:-moz-broken { -moz-force-broken-image-icon : 1; width : 24px; height : 24px; }' );
+ }
+
+ /* #3658: [IE6] Editor document has horizontal scrollbar on long lines
+ To prevent this misbehavior, we show the scrollbar always */
+ /* #6341: The text cursor must be set on the editor area. */
+ /* #6632: Avoid having "text" shape of cursor in IE7 scrollbars.*/
+ editor.addCss( 'html { _overflow-y: scroll; cursor: text; *cursor:auto;}' );
+ // Use correct cursor for these elements
+ editor.addCss( 'img, input, textarea { cursor: default;}' );
// Switch on design mode for a short while and close it after then.
function blinkCursor( retry )
{
+ if ( editor.readOnly )
+ return;
+
CKEDITOR.tools.tryThese(
function()
{
editor.document.$.designMode = 'on';
- setTimeout( function ()
+ setTimeout( function()
{
editor.document.$.designMode = 'off';
- editor.document.getBody().focus();
+ if ( CKEDITOR.currentInstance == editor )
+ editor.document.getBody().focus();
}, 50 );
},
function()
@@ -864,17 +1213,20 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
{
focusGrabber = editor.container.append( CKEDITOR.dom.element.createFromHtml(
// Use 'span' instead of anything else to fly under the screen-reader radar. (#5049)
- '' ) );
+ '' ) );
focusGrabber.on( 'focus', function()
{
editor.focus();
} );
+
+ editor.focusGrabber = focusGrabber;
} );
editor.on( 'destroy', function()
{
CKEDITOR.tools.removeFunction( contentDomReadyHandler );
focusGrabber.clearCustomData();
+ delete editor.focusGrabber;
} );
}
@@ -882,9 +1234,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
editor.on( 'insertElement', function ( evt )
{
var element = evt.data;
- if ( element.type = CKEDITOR.NODE_ELEMENT
+ if ( element.type == CKEDITOR.NODE_ELEMENT
&& ( element.is( 'input' ) || element.is( 'textarea' ) ) )
{
+ // We should flag that the element was locked by our code so
+ // it'll be editable by the editor functions (#6046).
+ if ( !element.isReadOnly() )
+ element.data( 'cke-editable', element.hasAttribute( 'contenteditable' ) ? 'true' : '1' );
element.setAttribute( 'contentEditable', false );
}
});
@@ -895,7 +1251,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// Fixing Firefox 'Back-Forward Cache' break design mode. (#4514)
if ( CKEDITOR.env.gecko )
{
- ( function ()
+ (function()
{
var body = document.body;
@@ -946,14 +1302,12 @@ CKEDITOR.config.disableObjectResizing = false;
CKEDITOR.config.disableNativeTableHandles = true;
/**
- * Disables the built-in spell checker while typing natively available in the
- * browser (currently Firefox and Safari only).
+ * Disables the built-in words spell checker if browser provides one.
*
- * Even if word suggestions will not appear in the CKEditor context menu, this
- * feature is useful to help quickly identifying misspelled words.
+ * Note: Although word suggestions provided by browsers (natively) will not appear in CKEditor's default context menu,
+ * users can always reach the native context menu by holding the Ctrl key when right-clicking if {@link CKEDITOR.config.browserContextMenuOnCtrl}
+ * is enabled or you're simply not using the context menu plugin.
*
- * This setting is currently compatible with Firefox only due to limitations in
- * other browsers.
* @type Boolean
* @default true
* @example
@@ -976,3 +1330,22 @@ CKEDITOR.config.ignoreEmptyParagraph = true;
* @name CKEDITOR.editor#dataReady
* @event
*/
+
+/**
+ * Whether automatically create wrapping blocks around inline contents inside document body,
+ * this helps to ensure the integrality of the block enter mode.
+ * Note: Changing the default value might introduce unpredictable usability issues.
+ * @name CKEDITOR.config.autoParagraph
+ * @since 3.6
+ * @type Boolean
+ * @default true
+ * @example
+ * config.autoParagraph = false;
+ */
+
+/**
+ * Fired when some elements are added to the document
+ * @name CKEDITOR.editor#ariaWidget
+ * @event
+ * @param {Object} element The element being added
+ */