X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fwysiwygarea%2Fplugin.js;h=5a0aca8a52abf45008298dbc85dc4a19ee8b63b7;hb=66f4ae0bf0280ed56bf7c0f4ab175424dd1d47a0;hp=c2566468138f0b3a44ca297bff12b4c7f1b0cfc4;hpb=059b4c2fef02528bf1af189f7996e80652faddfb;p=ckeditor.git
diff --git a/_source/plugins/wysiwygarea/plugin.js b/_source/plugins/wysiwygarea/plugin.js
index c256646..5a0aca8 100644
--- a/_source/plugins/wysiwygarea/plugin.js
+++ b/_source/plugins/wysiwygarea/plugin.js
@@ -161,6 +161,22 @@ 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 );
+
/**
* Auto-fixing block-less content by wrapping paragraph (#3190), prevent
* non-exitable-block by padding extra br.(#3189)
@@ -182,7 +198,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,20 +212,21 @@ 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 )
+ && isBlankParagraph( previousElement )
&& range.moveToElementEditStart( previousElement )
|| nextElement && nextElement.getName
- && !( nextElement.getName() in nonExitableElementNames )
- && range.moveToElementEditStart( nextElement ) )
+ && !( nextElement.getName() in nonExitableElementNames )
+ && isBlankParagraph( nextElement )
+ && range.moveToElementEditStart( nextElement ) )
{
fixedBlock.remove();
}
@@ -221,14 +241,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();
}
}
@@ -243,6 +281,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
var frameLabel = editor.lang.editorTitle.replace( '%1', editor.name );
+ var contentDomReadyHandler;
editor.on( 'editingBlockReady', function()
{
var mainElement,
@@ -262,13 +301,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
if ( iframe )
iframe.remove();
- frameLoaded = 0;
-
- var setDataFn = !CKEDITOR.env.gecko && CKEDITOR.tools.addFunction( function( doc )
- {
- CKEDITOR.tools.removeFunction( setDataFn );
- doc.write( data );
- });
var srcScript =
'document.open();' +
@@ -277,30 +309,30 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// call document.open().
( isCustomDomain ? ( 'document.domain="' + document.domain + '";' ) : '' ) +
- // With FF, it's better to load the data on
- // iframe.load. (#3894,#4058)
- // But in FF, we still need the open()-close() call
- // to avoid HTTPS warnings.
- ( CKEDITOR.env.gecko ? '' : ( 'parent.CKEDITOR.tools.callFunction(' + setDataFn + ',document);' ) ) +
-
'document.close();';
iframe = CKEDITOR.dom.element.createFromHtml( '' );
// With FF, it's better to load the data on iframe.load. (#3894,#4058)
- CKEDITOR.env.gecko && iframe.on( 'load', function( ev )
+ iframe.on( 'load', function( ev )
{
+ frameLoaded = 1;
ev.removeListener();
var doc = iframe.getFrameDocument().$;
- doc.open();
+ // Don't leave any history log in IE. (#5657)
+ doc.open( "text/html","replace" );
doc.write( data );
doc.close();
});
@@ -310,18 +342,19 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// 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 =
'';
// Editing area bootstrap code.
- var contentDomReady = function( domWindow )
+ function contentDomReady( domWindow )
{
- if ( frameLoaded )
+ if ( !frameLoaded )
return;
- frameLoaded = 1;
+ frameLoaded = 0;
editor.fire( 'ariaWidget', iframe );
@@ -332,8 +365,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
var script = domDocument.getElementById( "cke_actscrpt" );
script.parentNode.removeChild( script );
- delete CKEDITOR._[ 'contentDomReady' + editor.name ];
-
body.spellcheck = !editor.config.disableNativeSpellChecker;
if ( CKEDITOR.env.ie )
@@ -348,7 +379,44 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
body.removeAttribute( 'disabled' );
}
else
- domDocument.designMode = 'on';
+ {
+ // Avoid opening design mode in a frame window thread,
+ // which will cause host page scrolling.(#4397)
+ setTimeout( function()
+ {
+ // Prefer 'contentEditable' instead of 'designMode'. (#3593)
+ if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900
+ || CKEDITOR.env.opera )
+ domDocument.$.body.contentEditable = true;
+ else if ( CKEDITOR.env.webkit )
+ domDocument.$.body.parentNode.contentEditable = true;
+ else
+ domDocument.$.designMode = '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 );
+ }
// IE, Opera and Safari may not support it and throw
// errors.
@@ -358,6 +426,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
domWindow = editor.window = new CKEDITOR.dom.window( domWindow );
domDocument = editor.document = new CKEDITOR.dom.document( domDocument );
+ domDocument.on( 'dblclick', function( evt )
+ {
+ var element = evt.data.getTarget(),
+ data = { element : element, dialog : '' };
+ editor.fire( 'doubleclick', data );
+ data.dialog && editor.openDialog( data.dialog );
+ });
+
// Gecko/Webkit need some help when selecting control type elements. (#3448)
if ( !( CKEDITOR.env.ie || CKEDITOR.env.opera) )
{
@@ -390,7 +466,9 @@ 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' )
+ && domDocument.$.compatMode == 'CSS1Compat'
+ || CKEDITOR.env.gecko
+ || CKEDITOR.env.opera )
{
var htmlElement = domDocument.getDocumentElement();
htmlElement.on( 'mousedown', function( evt )
@@ -399,44 +477,37 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// have to use here a temporary element to 'redirect'
// the focus.
if ( evt.data.getTarget().equals( htmlElement ) )
- ieFocusGrabber.focus();
+ {
+ if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 )
+ blinkCursor();
+ focusGrabber.focus();
+ }
} );
}
- var focusTarget = ( CKEDITOR.env.ie || CKEDITOR.env.webkit ) ?
- domWindow : domDocument;
-
- focusTarget.on( 'blur', function()
+ domWindow.on( 'blur', function()
{
editor.focusManager.blur();
});
- focusTarget.on( 'focus', function()
+ domWindow.on( 'focus', function()
{
- // Gecko need a key event to 'wake up' the editing
- // ability when document is empty.(#3864)
- if ( CKEDITOR.env.gecko )
+ var doc = editor.document;
+
+ if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 )
+ blinkCursor();
+ else if ( CKEDITOR.env.opera )
+ doc.getBody().focus();
+ else if ( CKEDITOR.env.webkit )
{
- var first = body;
- while ( first.firstChild )
- first = first.firstChild;
+ // 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 ];
- if ( !first.nextSibling
- && ( 'BR' == first.tagName )
- && first.hasAttribute( '_moz_editor_bogus_node' ) )
- {
- var keyEventSimulate = domDocument.$.createEvent( "KeyEvents" );
- keyEventSimulate.initKeyEvent( 'keypress', true, true, domWindow.$, false,
- false, false, false, 0, 32 );
- domDocument.$.dispatchEvent( keyEventSimulate );
- var bogusText = domDocument.getBody().getFirst() ;
- // Compensate the line maintaining
if enterMode is not block.
- if ( editor.config.enterMode == CKEDITOR.ENTER_BR )
- domDocument.createElement( 'br', { attributes: { '_moz_dirty' : "" } } )
- .replace( bogusText );
- else
- bogusText.remove();
- }
+ doc.getDocumentElement().focus();
+ range && range.select();
}
editor.focusManager.focus();
@@ -448,6 +519,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
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 )
@@ -546,7 +618,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
}
},
0 );
- };
+ }
editor.addMode( 'wysiwyg',
{
@@ -616,6 +688,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// Check if the