Changelog - CKEditor

@@ -58,5 +84,5 @@

- Editor 1:
+ Editor 1: This is some sample text. You are using <a href="http://ckeditor.com/">CKEditor</a>.

@@ -68,8 +94,8 @@

- CKEditor - The text editor for Internet - http://ckeditor.com + CKEditor - The text editor for the Internet - http://ckeditor.com

Index: /CKEditor/branches/versions/3.5.x/_samples/output_for_flash.html =================================================================== --- /CKEditor/branches/versions/3.5.x/_samples/output_for_flash.html (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_samples/output_for_flash.html (revision 6396) @@ -1,10 +1,10 @@ - Output for Flash + Output for Flash — CKEditor Sample

@@ -45,10 +68,4 @@

- -

- This sample shows CKEditor configured to produce HTML code that can be used with - - Flash.

@@ -229,5 +246,5 @@ } - if ( element.attributes.style == '' ) + if ( element.attributes.style === '' ) delete element.attributes.style; @@ -251,8 +268,8 @@

- CKEditor - The text editor for Internet - http://ckeditor.com + CKEditor - The text editor for the Internet - http://ckeditor.com

Index: /CKEditor/branches/versions/3.5.x/_samples/output_html.html =================================================================== --- /CKEditor/branches/versions/3.5.x/_samples/output_html.html (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_samples/output_html.html (revision 6396) @@ -1,10 +1,10 @@ - HTML compliant output - CKEditor Sample + HTML Compliant Output — CKEditor Sample

@@ -32,10 +63,6 @@

- This sample shows CKEditor configured to produce a legacy HTML4 document. Traditional - HTML elements like , , and are used in place of - , and CSS styles.

- Editor 1:
+ Editor 1: This is some sample text. You are using <a href="http://ckeditor.com/">CKEditor</a>.

"Office 2003" skin

Use the following code to configure a CKEditor instance to use the "Office 2003" skin.

CKEDITOR.replace( 'textarea_id',
+	{
+		skin : 'office2003'
+	});

- "Office 2003" skin:
This is some sample text. You are using <a href="http://ckeditor.com/">CKEditor</a>.

- "V2" skin:
+

"V2" skin

Use the following code to configure a CKEditor instance to use the "V2" skin.

CKEDITOR.replace( 'textarea_id',
+	{
+		skin : 'v2'
+	});

- CKEditor - The text editor for Internet - http://ckeditor.com + CKEditor - The text editor for the Internet - http://ckeditor.com

Index: /CKEditor/branches/versions/3.5.x/_samples/ui_color.html =================================================================== --- /CKEditor/branches/versions/3.5.x/_samples/ui_color.html (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_samples/ui_color.html (revision 6396) @@ -1,10 +1,10 @@ - UI Color Setting Tool - CKEditor Sample + UI Color Picker — CKEditor Sample

@@ -31,5 +64,10 @@

- Click the UI Color Picker button to test your color preferences at runtime.

+ Click the UI Color Picker button to test your color preferences at runtime. +

+ The first editor instance includes the UI Color Picker toolbar button, + but the default UI color is not defined, so the editor uses the skin color. +

@@ -52,4 +90,8 @@ //]]> +

+ The second editor instance includes the UI Color Picker toolbar button. The + default UI color was defined, so the skin color is not used.

@@ -81,8 +123,8 @@

- CKEditor - The text editor for Internet - http://ckeditor.com + CKEditor - The text editor for the Internet - http://ckeditor.com

Index: /CKEditor/branches/versions/3.5.x/_samples/ui_languages.html =================================================================== --- /CKEditor/branches/versions/3.5.x/_samples/ui_languages.html (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_samples/ui_languages.html (revision 6396) @@ -1,10 +1,10 @@ - User Interface Globalization - CKEditor Sample + User Interface Globalization — CKEditor Sample

@@ -50,5 +81,5 @@
- (You may see strange characters if your system doesn't + (You may see strange characters if your system does not support the selected language)

@@ -98,8 +129,8 @@

- CKEditor - The text editor for Internet - http://ckeditor.com + CKEditor - The text editor for the Internet - http://ckeditor.com

Index: /CKEditor/branches/versions/3.5.x/_source/adapters/jquery.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/adapters/jquery.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/adapters/jquery.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/_bootstrap.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/_bootstrap.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/_bootstrap.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/ajax.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/ajax.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/ajax.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/ckeditor.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/ckeditor.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/ckeditor.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ @@ -60,7 +60,8 @@ /** - * Removes and editor instance from the global {@link CKEDITOR} object. his function - * is available for internal use mainly. - * @param {CKEDITOR.editor} editor The editor instance to be added. + * Removes an editor instance from the global {@link CKEDITOR} object. This function + * is available for internal use only. External code must use {@link CKEDITOR.editor.prototype.destroy} + * to avoid memory leaks. + * @param {CKEDITOR.editor} editor The editor instance to be removed. * @example */ @@ -132,2 +133,9 @@ * }); */ + +/** + * Fired when the last instance has been destroyed. This event is used to perform + * global memory clean up. + * @name CKEDITOR#reset + * @event + */ Index: /CKEditor/branches/versions/3.5.x/_source/core/ckeditor_base.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/ckeditor_base.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/ckeditor_base.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ @@ -81,9 +81,9 @@ *

basic_ready: the basic API is ready to load the full core code.

loading: the full API is being loaded.

- *

ready: the API can be fully used.

+ *

loaded: the API can be fully used.

- * ele.getReadOnlyRoot(); // the

element + * // If "ele" is the above <div> + * ele.isReadOnly(); // the <div> element * - * // If "ele" is the above - * ele.getReadOnlyRoot(); // the
element + * // If "ele" is the above + * ele.isReadOnly(); // the <div> element */ isReadOnly : function() @@ -680,5 +680,5 @@ if ( current.type == CKEDITOR.NODE_ELEMENT ) { - if ( current.is( 'body' ) || current.getCustomData( '_cke_notReadOnly' ) ) + if ( current.is( 'body' ) || !!current.data( 'cke-editable' ) ) break; Index: /CKEditor/branches/versions/3.5.x/_source/core/dom/nodelist.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/dom/nodelist.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/dom/nodelist.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/dom/range.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/dom/range.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/dom/range.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ @@ -33,5 +33,5 @@ // contents. // V2 - var execContentsAction = function( range, action, docFrag ) + var execContentsAction = function( range, action, docFrag, mergeThen ) { range.optimizeBookmark(); @@ -248,5 +248,15 @@ endIndex--; - range.setStart( topEnd.getParent(), endIndex ); + // Merge splitted parents. + if ( mergeThen && topStart.type == CKEDITOR.NODE_ELEMENT ) + { + var span = CKEDITOR.dom.element.createFromHtml( ' ', range.document ); + span.insertAfter( topStart ); + topStart.mergeSiblings( false ); + range.moveToBookmark( { startNode : span } ); + } + else + range.setStart( topEnd.getParent(), endIndex ); } @@ -368,11 +378,12 @@ /** * Deletes the content nodes of the range permanently from the DOM tree. + * @param {Boolean} [mergeThen] Merge any splitted elements result in DOM true due to partial selection. */ - deleteContents : function() + deleteContents : function( mergeThen ) { if ( this.collapsed ) return; - execContentsAction( this, 0 ); + execContentsAction( this, 0, null, mergeThen ); }, @@ -380,11 +391,12 @@ * The content nodes of the range are cloned and added to a document fragment, * meanwhile they're removed permanently from the DOM tree. + * @param {Boolean} [mergeThen] Merge any splitted elements result in DOM true due to partial selection. */ - extractContents : function() + extractContents : function( mergeThen ) { var docFrag = new CKEDITOR.dom.documentFragment( this.document ); if ( !this.collapsed ) - execContentsAction( this, 1, docFrag ); + execContentsAction( this, 1, docFrag, mergeThen ); return docFrag; @@ -812,5 +824,10 @@ }, - enlarge : function( unit ) + /** + * Expands the range so that partial units are completely contained. + * @param unit {Number} The unit type to expand with. + * @param {Boolean} [excludeBrs=false] Whether include line-breaks when expanding. + */ + enlarge : function( unit, excludeBrs ) { switch ( unit ) @@ -933,5 +950,6 @@ // We need to check for the bookmark attribute because IE insists on // rendering the display:none nodes we use for bookmarks. (#3363) - if ( sibling.$.offsetWidth > 0 && !sibling.data( 'cke-bookmark' ) ) + // Line-breaks (br) are rendered with zero width, which we don't want to include. (#7041) + if ( ( sibling.$.offsetWidth > 0 || excludeBrs && sibling.is( 'br' ) ) && !sibling.data( 'cke-bookmark' ) ) { // We'll accept it only if we need @@ -1092,5 +1110,6 @@ // We need to check for the bookmark attribute because IE insists on // rendering the display:none nodes we use for bookmarks. (#3363) - if ( sibling.$.offsetWidth > 0 && !sibling.data( 'cke-bookmark' ) ) + // Line-breaks (br) are rendered with zero width, which we don't want to include. (#7041) + if ( ( sibling.$.offsetWidth > 0 || excludeBrs && sibling.is( 'br' ) ) && !sibling.data( 'cke-bookmark' ) ) { // We'll accept it only if we need @@ -1756,4 +1775,45 @@ /** + * Check if elements at which the range boundaries anchor are read-only, + * with respect to "contenteditable" attribute. + */ + checkReadOnly : ( function() + { + function checkNodesEditable( node, anotherEnd ) + { + while( node ) + { + if ( node.type == CKEDITOR.NODE_ELEMENT ) + { + if ( node.getAttribute( 'contentEditable' ) == 'false' + && !node.data( 'cke-editable' ) ) + { + return 0; + } + // Range enclosed entirely in an editable element. + else if ( node.is( 'body' ) + || node.getAttribute( 'contentEditable' ) == 'true' + && ( node.contains( anotherEnd ) || node.equals( anotherEnd ) ) ) + { + break; + } + } + node = node.getParent(); + } + + return 1; + } + + return function() + { + var startNode = this.startContainer, + endNode = this.endContainer; + + // Check if elements path at both boundaries are editable. + return !( checkNodesEditable( startNode, endNode ) && checkNodesEditable( endNode, startNode ) ); + }; + })(), + + /** * Moves the range boundaries to the first/end editing point inside an * element. For example, in an element tree like Index: /CKEditor/branches/versions/3.5.x/_source/core/dom/rangelist.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/dom/rangelist.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/dom/rangelist.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/dom/text.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/dom/text.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/dom/text.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/dom/walker.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/dom/walker.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/dom/walker.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ @@ -422,10 +422,22 @@ }; + CKEDITOR.dom.walker.nodeType = function( type, isReject ) + { + return function( node ) + { + return !! ( isReject ^ ( node.type == type ) ); + }; + }; + var tailNbspRegex = /^[\t\r\n ]*(?: |\xa0)$/, - isNotWhitespaces = CKEDITOR.dom.walker.whitespaces( 1 ), - isNotBookmark = CKEDITOR.dom.walker.bookmark( 0, 1 ), - fillerEvaluator = function( element ) - { - return isNotBookmark( element ) && isNotWhitespaces( element ); + isWhitespaces = CKEDITOR.dom.walker.whitespaces(), + isBookmark = CKEDITOR.dom.walker.bookmark(), + toSkip = function( node ) + { + return isBookmark( node ) + || isWhitespaces( node ) + || node.type == CKEDITOR.NODE_ELEMENT + && node.getName() in CKEDITOR.dtd.$inline + && !( node.getName() in CKEDITOR.dtd.$empty ); }; @@ -433,5 +445,9 @@ CKEDITOR.dom.element.prototype.getBogus = function() { - var tail = this.getLast( fillerEvaluator ); + // Bogus are not always at the end, e.g.
text
(#7070). + var tail = this; + do { tail = tail.getPreviousSourceNode(); } + while ( toSkip( tail ) ) + if ( tail && ( !CKEDITOR.env.ie ? tail.is && tail.is( 'br' ) : tail.getText && tailNbspRegex.test( tail.getText() ) ) ) Index: /CKEditor/branches/versions/3.5.x/_source/core/dom/window.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/dom/window.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/dom/window.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/dtd.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/dtd.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/dtd.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/editor.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/editor.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/editor.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ @@ -368,5 +368,5 @@ // Setup the submit function because it doesn't fire the // "submit" event. - if ( !form.$.submit.nodeName ) + if ( !form.$.submit.nodeName && !form.$.submit.length ) { form.$.submit = CKEDITOR.tools.override( form.$.submit, function( originalSubmit ) @@ -548,40 +548,5 @@ this.updateElement(); - if ( this.mode ) - { - // -> currentMode.unload( holderElement ); - this._.modes[ this.mode ].unload( this.getThemeSpace( 'contents' ) ); - } - - this.theme.destroy( this ); - - var toolbars, - index = 0, - j, - items, - instance; - - if ( this.toolbox ) - { - toolbars = this.toolbox.toolbars; - for ( ; index < toolbars.length ; index++ ) - { - items = toolbars[ index ].items; - for ( j = 0 ; j < items.length ; j++ ) - { - instance = items[ j ]; - if ( instance.clickFn ) CKEDITOR.tools.removeFunction( instance.clickFn ); - if ( instance.keyDownFn ) CKEDITOR.tools.removeFunction( instance.keyDownFn ); - - if ( instance.index ) CKEDITOR.ui.button._.instances[ instance.index ] = null; - } - } - } - - if ( this.contextMenu ) - CKEDITOR.tools.removeFunction( this.contextMenu._.functionId ); - - if ( this._.filebrowserFn ) - CKEDITOR.tools.removeFunction( this._.filebrowserFn ); + this.theme && this.theme.destroy( this ); this.fire( 'destroy' ); @@ -893,7 +858,7 @@ /** * Fired when all plugins are loaded and initialized into the editor instance. - * @name CKEDITOR#pluginsLoaded - * @event - * @param {CKEDITOR.editor} editor The editor instance that has been destroyed. + * @name CKEDITOR.editor#pluginsLoaded + * @event + * @param {CKEDITOR.editor} editor This editor instance. */ @@ -942,2 +907,78 @@ * alert( 'This is a full page editor' ); */ + +/** + * Fired when this editor instance is destroyed. The editor at this + * point isn't usable and this event should be used to perform clean up + * in any plugin. + * @name CKEDITOR.editor#destroy + * @event + */ + +/** + * Internal event to get the current data. + * @name CKEDITOR.editor#beforeGetData + * @event + */ + +/** + * Internal event to perform the #getSnapshot call. + * @name CKEDITOR.editor#getSnapshot + * @event + */ + +/** + * Internal event to perform the #loadSnapshot call. + * @name CKEDITOR.editor#loadSnapshot + * @event + */ + + +/** + * Event fired before the #getData call returns allowing additional manipulation. + * @name CKEDITOR.editor#getData + * @event + * @param {CKEDITOR.editor} editor This editor instance. + * @param {String} data.dataValue The data that will be returned. + */ + +/** + * Event fired before the #setData call is executed allowing additional manipulation. + * @name CKEDITOR.editor#setData + * @event + * @param {CKEDITOR.editor} editor This editor instance. + * @param {String} data.dataValue The data that will be used. + */ + +/** + * Event fired at the end of the #setData call is executed. Usually it's better to use the + * {@link CKEDITOR.editor.prototype.dataReady} event. + * @name CKEDITOR.editor#afterSetData + * @event + * @param {CKEDITOR.editor} editor This editor instance. + * @param {String} data.dataValue The data that has been set. + */ + +/** + * Internal event to perform the #insertHtml call + * @name CKEDITOR.editor#insertHtml + * @event + * @param {CKEDITOR.editor} editor This editor instance. + * @param {String} data The HTML to insert. + */ + +/** + * Internal event to perform the #insertText call + * @name CKEDITOR.editor#insertText + * @event + * @param {CKEDITOR.editor} editor This editor instance. + * @param {String} text The text to insert. + */ + +/** + * Internal event to perform the #insertElement call + * @name CKEDITOR.editor#insertElement + * @event + * @param {CKEDITOR.editor} editor This editor instance. + * @param {Object} element The element to insert. + */ Index: /CKEditor/branches/versions/3.5.x/_source/core/editor_basic.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/editor_basic.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/editor_basic.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ @@ -99,4 +99,8 @@ element = document.getElementById( elementOrIdOrName ); + // Elements that should go into head are unacceptable (#6791). + if ( element && element.tagName.toLowerCase() in {style:1,script:1,base:1,link:1,meta:1,title:1} ) + element = null; + // If not found, look for elements by name. In this case we accept only // textareas. Index: /CKEditor/branches/versions/3.5.x/_source/core/env.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/env.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/env.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/event.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/event.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/event.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/eventInfo.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/eventInfo.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/eventInfo.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/focusmanager.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/focusmanager.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/focusmanager.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/htmlparser.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/htmlparser.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/htmlparser.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/basicwriter.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/basicwriter.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/basicwriter.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/cdata.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/cdata.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/cdata.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/comment.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/comment.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/comment.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/element.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/element.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/element.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ @@ -37,7 +37,16 @@ var tagName = attributes[ 'data-cke-real-element-type' ] || name; + // Reveal the real semantic of our internal custom tag name (#6639). + var internalTag = tagName.match( /^cke:(.*)/ ); + internalTag && ( tagName = internalTag[ 1 ] ); + var dtd = CKEDITOR.dtd, - isBlockLike = !!( dtd.$nonBodyContent[ tagName ] || dtd.$block[ tagName ] || dtd.$listItem[ tagName ] || dtd.$tableContent[ tagName ] || dtd.$nonEditable[ tagName ] || tagName == 'br' ), - isEmpty = !!dtd.$empty[ name ]; + isBlockLike = !!( dtd.$nonBodyContent[ tagName ] + || dtd.$block[ tagName ] + || dtd.$listItem[ tagName ] + || dtd.$tableContent[ tagName ] + || dtd.$nonEditable[ tagName ] + || tagName == 'br' ), + isEmpty = !!dtd.$empty[ name ]; this.isEmpty = isEmpty; Index: /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/filter.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/filter.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/filter.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/fragment.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/fragment.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/fragment.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ @@ -119,5 +119,5 @@ target = target || currentNode || fragment; - // If the target is the fragment and this element can't go inside + // If the target is the fragment and this inline element can't go inside // body (if fixForBody). if ( fixForBody && !target.type ) @@ -130,7 +130,6 @@ else elementName = element.name; - if ( elementName - && !( elementName in CKEDITOR.dtd.$body ) - && !( elementName in CKEDITOR.dtd.$nonBodyContent ) ) + + if ( elementName && elementName in CKEDITOR.dtd.$inline ) { var savedCurrent = currentNode; @@ -393,4 +392,5 @@ parser.onComment = function( comment ) { + sendPendingBRs(); checkPending(); currentNode.add( new CKEDITOR.htmlParser.comment( comment ) ); Index: /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/text.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/text.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/text.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/lang.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/lang.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/lang.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/loader.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/loader.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/loader.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/plugindefinition.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/plugindefinition.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/plugindefinition.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/plugins.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/plugins.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/plugins.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/resourcemanager.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/resourcemanager.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/resourcemanager.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ Index: /CKEditor/branches/versions/3.5.x/_source/core/scriptloader.js =================================================================== --- /CKEditor/branches/versions/3.5.x/_source/core/scriptloader.js (revision 6395) +++ /CKEditor/branches/versions/3.5.x/_source/core/scriptloader.js (revision 6396) @@ -1,4 +1,4 @@ /* -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 */ @@ -34,6 +34,4 @@ * @param {Object} [scope] The scope ("this" reference) to be used for * the callback call. Default to {@link CKEDITOR}. - * @param {Boolean} [noCheck] Indicates that the script must be loaded - * anyway, not checking if it has already loaded. * @param {Boolean} [showBusy] Changes the cursor of the document while + * the script is loaded. @@ -54,5 +52,5 @@ * }); */ - load : function( scriptUrl, callback, scope, noCheck, showBusy ) + load : function( scriptUrl, callback, scope, showBusy ) { var isString = ( typeof scriptUrl == 'string' ); @@ -112,5 +110,5 @@ var loadScript = function( url ) { - if ( noCheck !== true && uniqueScripts[ url ] ) + if ( uniqueScripts[ url ] ) { checkLoaded( url, true ); @@ -178,22 +176,4 @@ loadScript( scriptUrl[ i ] ); } - }, - - /** - * Executes a JavaScript code into the current document. - * @param {String} code The code to be executed. - * @example - * CKEDITOR.scriptLoader.loadCode( 'var x = 10;' ); - * alert( x ); // "10" - */ - loadCode : function( code ) - { - // Create the

+

CKEditor - Adobe AIR Sample

- CKEditor Samples List +

+ CKEditor Samples Site

+

Basic Samples

+

Basic Customization

+

Advanced Samples

- CKEditor Sample +

+ CKEditor Sample — Using jQuery Adapter

"Office 2003" skin

"V2" skin