X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fwysiwygarea%2Fplugin.js;h=c2a8b152f9e364f13676ca85bdfd1a14b450b3e6;hb=941b0a9ba4e673e292510d80a5a86806994b8ea6;hp=ab06245624173000bc0e7a841a39f8c23e74b434;hpb=8761695d9b70afe75905deaac88f78c1f8aeb32d;p=ckeditor.git
diff --git a/_source/plugins/wysiwygarea/plugin.js b/_source/plugins/wysiwygarea/plugin.js
index ab06245..c2a8b15 100644
--- a/_source/plugins/wysiwygarea/plugin.js
+++ b/_source/plugins/wysiwygarea/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
*/
@@ -10,18 +10,18 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
(function()
{
- /**
- * List of elements in which has no way to move editing focus outside.
- */
+ // 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*(?: ]*>| | )\s*(:?<\/\1>)?\s*$/gi;
+ var emptyParagraphRegexp = /\s*<(p|div|address|h\d|center)[^>]*>\s*(?: ]*>| |\u00A0| )?\s*(:?<\/\1>)?\s*(?=$|<\/body>)/gi;
function onInsertHtml( evt )
{
if ( this.mode == 'wysiwyg' )
{
this.focus();
+ this.fire( 'saveSnapshot' );
var selection = this.getSelection(),
data = evt.data;
@@ -46,6 +46,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
}
else
this.document.$.execCommand( 'inserthtml', false, data );
+
+ CKEDITOR.tools.setTimeout( function()
+ {
+ this.fire( 'saveSnapshot' );
+ }, 0, this );
}
}
@@ -88,9 +93,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
&& ( dtd = CKEDITOR.dtd[ current.getName() ] )
&& !( dtd && dtd [ elementName ] ) )
{
+ // 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)
- if ( range.checkStartOfBlock()
+ else if ( range.checkStartOfBlock()
&& range.checkEndOfBlock() )
{
range.setStartBefore( current );
@@ -139,6 +147,20 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
setTimeout( function(){ editor.resetDirty(); } );
}
+ var isNotWhitespace = CKEDITOR.dom.walker.whitespaces( true ),
+ isNotBookmark = CKEDITOR.dom.walker.bookmark( false, true );
+
+ function isNotEmpty( node )
+ {
+ return isNotWhitespace( node ) && isNotBookmark( node );
+ }
+
+ function isNbsp( node )
+ {
+ return node.type == CKEDITOR.NODE_TEXT
+ && CKEDITOR.tools.trim( node.getText() ).match( /^(?: |\xa0)$/ );
+ }
+
/**
* Auto-fixing block-less content by wrapping paragraph (#3190), prevent
* non-exitable-block by padding extra br.(#3189)
@@ -161,61 +183,52 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
&& !path.block )
{
restoreDirty( editor );
- var bms = selection.createBookmarks(),
- fixedBlock = range.fixBlock( true,
+ var fixedBlock = range.fixBlock( true,
editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' );
- // For IE, we'll be removing any bogus br ( introduce by fixing body )
- // right now to prevent it introducing visual line break.
+ // For IE, we should remove any filler node which was introduced before.
if ( CKEDITOR.env.ie )
{
- var brNodeList = fixedBlock.getElementsByTag( 'br' ), brNode;
- for ( var i = 0 ; i < brNodeList.count() ; i++ )
- {
- if( ( brNode = brNodeList.getItem( i ) ) && brNode.hasAttribute( '_cke_bogus' ) )
- brNode.remove();
- }
+ var first = fixedBlock.getFirst( isNotEmpty );
+ first && isNbsp( first ) && first.remove();
}
- selection.selectBookmarks( bms );
-
- // If the fixed block is blank and is already followed by a exitable
- // block, we should drop it and move to the exist block(#3684).
- var children = fixedBlock.getChildren(),
- count = children.count(),
- firstChild,
- whitespaceGuard = CKEDITOR.dom.walker.whitespaces( true ),
- previousElement = fixedBlock.getPrevious( whitespaceGuard ),
- nextElement = fixedBlock.getNext( whitespaceGuard ),
- enterBlock;
- if ( previousElement && previousElement.getName
- && !( previousElement.getName() in nonExitableElementNames ) )
- enterBlock = previousElement;
- else if ( nextElement && nextElement.getName
- && !( nextElement.getName() in nonExitableElementNames ) )
- enterBlock = nextElement;
-
- // Not all blocks are editable, e.g.
, further checking it.(#3994)
- if( ( !count
- || ( firstChild = children.getItem( 0 ) ) && firstChild.is && firstChild.is( 'br' ) )
- && enterBlock
- && range.moveToElementEditStart( enterBlock ) )
+ // If the fixed block is blank and already followed by a exitable
+ // block, we should revert the fix. (#3684)
+ if( fixedBlock.getOuterHtml().match( emptyParagraphRegexp ) )
{
- fixedBlock.remove();
- range.select();
+ 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 ) )
+ {
+ fixedBlock.remove();
+ }
}
+
+ range.select();
+ // Notify non-IE that selection has changed.
+ if( !CKEDITOR.env.ie )
+ editor.selectionChange();
}
- // Inserting the padding-br before body if it's preceded by an
- // unexitable block.
+ // 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 ) )
{
restoreDirty( editor );
- var paddingBlock = editor.document.createElement(
- ( CKEDITOR.env.ie && enterMode != CKEDITOR.ENTER_BR ) ?
- ' ' : 'br' );
- body.append( paddingBlock );
+ if( !CKEDITOR.env.ie )
+ body.appendBogus();
+ else
+ body.append( editor.document.createText( '\xa0' ) );
}
}
@@ -242,7 +255,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
var isCustomDomain = CKEDITOR.env.isCustomDomain();
// Creates the iframe that holds the editable document.
- var createIFrame = function()
+ var createIFrame = function( data )
{
if ( iframe )
iframe.remove();
@@ -250,46 +263,41 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
fieldset.remove();
frameLoaded = 0;
- // The document domain must be set within the src
- // attribute;
- // Defer the script execution until iframe
- // has been added to main window, this is needed for some
- // browsers which will begin to load the frame content
- // prior to it's presentation in DOM.(#3894)
- var src = 'void( '
- + ( CKEDITOR.env.gecko ? 'setTimeout' : '' ) + '( function(){' +
- 'document.open();' +
- ( CKEDITOR.env.ie && isCustomDomain ? 'document.domain="' + document.domain + '";' : '' ) +
- 'document.write( window.parent[ "_cke_htmlToLoad_' + editor.name + '" ] );' +
- 'document.close();' +
- 'window.parent[ "_cke_htmlToLoad_' + editor.name + '" ] = null;' +
- '}'
- + ( CKEDITOR.env.gecko ? ', 0 )' : ')()' )
- + ' )';
-
- // Loading via src attribute does not work in Opera.
- if ( CKEDITOR.env.opera )
- src = 'void(0);';
iframe = CKEDITOR.dom.element.createFromHtml( '' );
+ ' style="width:100%;height:100%"' +
+ ' frameBorder="0"' +
+ // Support for custom document.domain in IE.
+ ( isCustomDomain ?
+ ' src="javascript:void((function(){' +
+ 'document.open();' +
+ 'document.domain=\'' + document.domain + '\';' +
+ 'document.close();' +
+ '})())"' : '' ) +
+ ' tabIndex="-1"' +
+ ' allowTransparency="true"' +
+ '>' );
+
+ // 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().$;
+
+ // Custom domain handling is needed after each document.open().
+ doc.open();
+ if ( isCustomDomain )
+ doc.domain = document.domain;
+ doc.write( data );
+ doc.close();
+
+ } );
var accTitle = editor.lang.editorTitle.replace( '%1', editor.name );
if ( CKEDITOR.env.gecko )
{
- // Double checking the iframe will be loaded properly(#4058).
- iframe.on( 'load', function( ev )
- {
- ev.removeListener();
- contentDomReady( iframe.$.contentWindow );
- } );
-
// Accessibility attributes for Firefox.
mainElement.setAttributes(
{
@@ -329,16 +337,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
mainElement.append( iframe );
};
- // The script that is appended to the data being loaded. It
- // enables editing, and makes some
+ // The script that launches the bootstrap logic on 'domReady', so the document
+ // is fully editable even before the editing iframe is fully loaded (#4455).
var activationScript =
'';
// Editing area bootstrap code.
@@ -411,6 +414,22 @@ 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' )
+ {
+ var htmlElement = domDocument.getDocumentElement();
+ htmlElement.on( 'mousedown', function( evt )
+ {
+ // Setting focus directly on editor doesn't work, we
+ // have to use here a temporary element to 'redirect'
+ // the focus.
+ if ( evt.data.getTarget().equals( htmlElement ) )
+ ieFocusGrabber.focus();
+ } );
+ }
+
var focusTarget = ( CKEDITOR.env.ie || CKEDITOR.env.webkit ) ?
domWindow : domDocument;
@@ -454,13 +473,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
if ( keystrokeHandler )
keystrokeHandler.attach( domDocument );
- // Cancel default action for backspace in IE on control types. (#4047)
if ( CKEDITOR.env.ie )
{
- editor.on( 'key', function( event )
+ // Cancel default action for backspace in IE on control types. (#4047)
+ domDocument.on( 'keydown', function( evt )
{
// Backspace.
- var control = event.data.keyCode == 8
+ var control = evt.data.getKeystroke() == 8
&& editor.getSelection().getSelectedElement();
if ( control )
{
@@ -469,14 +488,31 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// Remove manually.
control.remove();
editor.fire( 'saveSnapshot' );
- event.cancel();
+ evt.cancel();
}
} );
+
+ // PageUp/PageDown scrolling is broken in document
+ // with standard doctype, manually fix it. (#4736)
+ if( domDocument.$.compatMode == 'CSS1Compat' )
+ {
+ var pageUpDownKeys = { 33 : 1, 34 : 1 };
+ domDocument.on( 'keydown', function( evt )
+ {
+ if( evt.data.getKeystroke() in pageUpDownKeys )
+ {
+ setTimeout( function ()
+ {
+ editor.getSelection().scrollIntoView();
+ }, 0 );
+ }
+ } );
+ }
}
// Adds the document body as a context menu target.
if ( editor.contextMenu )
- editor.contextMenu.addTarget( domDocument );
+ editor.contextMenu.addTarget( domDocument, editor.config.browserContextMenuOnCtrl !== false );
setTimeout( function()
{
@@ -550,54 +586,107 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
{
isLoadingData = true;
- // Get the HTML version of the data.
- if ( editor.dataProcessor )
+ var config = editor.config,
+ fullPage = config.fullPage,
+ docType = config.docType;
+
+ // Build the additional stuff to be included into .
+ var headExtra =
+ '';
+
+ !fullPage && ( headExtra =
+ CKEDITOR.tools.buildStyleHtml( editor.config.contentsCss ) +
+ headExtra );
+
+ var baseTag = config.baseHref ? '' : '';
+
+ if ( fullPage )
{
- data = editor.dataProcessor.toHtml( data, fixForBody );
+ // Search and sweep out the doctype declaration.
+ data = data.replace( /]*>/i, function( match )
+ {
+ editor.docType = docType = match;
+ return '';
+ });
}
- data =
- editor.config.docType +
- '' +
- '' +
- '' +
- ''+
- '' +
- '' +
- data +
- '' +
- '' +
- activationScript;
-
- window[ '_cke_htmlToLoad_' + editor.name ] = data;
- CKEDITOR._[ 'contentDomReady' + editor.name ] = contentDomReady;
- createIFrame();
+ // Get the HTML version of the data.
+ if ( editor.dataProcessor )
+ data = editor.dataProcessor.toHtml( data, fixForBody );
- // Opera must use the old method for loading contents.
- if ( CKEDITOR.env.opera )
+ if ( fullPage )
+ {
+ // Check if the tag is available.
+ if ( !(/]/).test( data ) )
+ data = '' + data;
+
+ // Check if the tag is available.
+ if ( !(/]/).test( data ) )
+ data = '' + data + '';
+
+ // Check if the tag is available.
+ if ( !(/]/).test( data ) )
+ data = data.replace( /]*>/, '$&' ) ;
+
+ // The base must be the first tag in the HEAD, e.g. to get relative
+ // links on styles.
+ baseTag && ( data = data.replace( //, '$&' + baseTag ) );
+
+ // Inject the extra stuff into .
+ // Attention: do not change it before testing it well. (V2)
+ // This is tricky... if the head ends with ,
+ // Firefox will break. But, it works if we place our extra stuff as
+ // the last elements in the HEAD.
+ data = data.replace( /<\/head\s*>/, headExtra + '$&' );
+
+ // Add the DOCTYPE back to it.
+ data = docType + data;
+ }
+ else
{
- var doc = iframe.$.contentWindow.document;
- doc.open();
- doc.write( data );
- doc.close();
+ data =
+ config.docType +
+ '' +
+ '' +
+ baseTag +
+ headExtra +
+ '' +
+ '' +
+ data +
+ '';
}
+
+ data += activationScript;
+
+ CKEDITOR._[ 'contentDomReady' + editor.name ] = contentDomReady;
+ createIFrame( data );
},
getData : function()
{
- var data = iframe.getFrameDocument().getBody().getHtml();
+ var config = editor.config,
+ fullPage = config.fullPage,
+ docType = fullPage && editor.docType,
+ doc = iframe.getFrameDocument();
+
+ var data = fullPage
+ ? doc.getDocumentElement().getOuterHtml()
+ : doc.getBody().getHtml();
if ( editor.dataProcessor )
data = editor.dataProcessor.toDataFormat( data, fixForBody );
// Strip the last blank paragraph within document.
- if ( editor.config.ignoreEmptyParagraph )
+ if ( config.ignoreEmptyParagraph )
data = data.replace( emptyParagraphRegexp, '' );
+ if ( docType )
+ data = docType + '\n' + data;
+
return data;
},
@@ -625,6 +714,25 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
else if ( editor.window )
{
editor.window.focus();
+
+ // Force the selection to happen, in this way
+ // we guarantee the focus will be there. (#4848)
+ if ( CKEDITOR.env.ie )
+ {
+ try
+ {
+ var sel = editor.getSelection();
+ sel = sel && sel.getNative();
+ var range = sel && sel.type && sel.createRange();
+ if ( range )
+ {
+ sel.empty();
+ range.select();
+ }
+ }
+ catch (e) {}
+ }
+
editor.selectionChange();
}
}
@@ -635,8 +743,60 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
// Auto fixing on some document structure weakness to enhance usabilities. (#3190 and #3189)
editor.on( 'selectionChange', onSelectionChangeFixBody, null, null, 1 );
});
+
+ // Create an invisible element to grab focus.
+ if( CKEDITOR.env.ie )
+ {
+ var ieFocusGrabber;
+ editor.on( 'uiReady', function()
+ {
+ ieFocusGrabber = editor.container.append( CKEDITOR.dom.element.createFromHtml(
+ '' ) );
+
+ ieFocusGrabber.on( 'focus', function()
+ {
+ editor.focus();
+ } );
+ } );
+ }
}
});
+
+ // Fixing Firefox 'Back-Forward Cache' break design mode. (#4514)
+ if( CKEDITOR.env.gecko )
+ {
+ var topWin = window.top;
+
+ ( function ()
+ {
+ var topBody = topWin.document.body;
+
+ if( !topBody )
+ topWin.addEventListener( 'load', arguments.callee, false );
+ else
+ {
+ topBody.setAttribute( 'onpageshow', topBody.getAttribute( 'onpageshow' )
+ + ';event.persisted && CKEDITOR.tools.callFunction(' +
+ CKEDITOR.tools.addFunction( function()
+ {
+ var allInstances = CKEDITOR.instances,
+ editor,
+ doc;
+ for( var i in allInstances )
+ {
+ editor = allInstances[ i ];
+ doc = editor.document;
+ if( doc )
+ {
+ doc.$.designMode = 'off';
+ doc.$.designMode = 'on';
+ }
+ }
+ } ) + ')' );
+ }
+ } )();
+
+ }
})();
/**