Changelog - CKEditor

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

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

@@ -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.6.x/_samples/output_for_flash.html =================================================================== --- /CKEditor/branches/versions/3.6.x/_samples/output_for_flash.html (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_samples/output_for_flash.html (revision 6660) @@ -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.6.x/_samples/output_html.html =================================================================== --- /CKEditor/branches/versions/3.6.x/_samples/output_html.html (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_samples/output_html.html (revision 6660) @@ -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 <b>, <i>, and <font> are used in place of - <strong>, <em> and CSS styles.

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

"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:
<p>This is some <strong>sample text</strong>. You are using <a href="http://ckeditor.com/">CKEditor</a>.</p>

- "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.6.x/_samples/ui_color.html =================================================================== --- /CKEditor/branches/versions/3.6.x/_samples/ui_color.html (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_samples/ui_color.html (revision 6660) @@ -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.6.x/_samples/ui_languages.html =================================================================== --- /CKEditor/branches/versions/3.6.x/_samples/ui_languages.html (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_samples/ui_languages.html (revision 6660) @@ -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.6.x/_source/adapters/jquery.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/adapters/jquery.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/adapters/jquery.js (revision 6660) @@ -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,13 +33,19 @@ { /** - * Allow CKEditor to override jQuery.fn.val(). This results in ability to use val() - * function on textareas as usual and having those calls synchronized with CKEditor - * Rich Text Editor component. - * - * This config option is global and executed during plugin load. - * Can't be customized across editor instances. - * + * Allows CKEditor to override jQuery.fn.val(), making it possible to use the val() + * function on textareas, as usual, having it synchronized with CKEditor.
+ *
+ * This configuration option is global and executed during the jQuery Adapter loading. + * It can't be customized across editor instances. * @type Boolean * @example + * <script> + * CKEDITOR.config.jqueryOverrideVal = true; + * </script> + *  + * <script src="/ckeditor/adapters/jquery.js"></script> + * @example + * // ... then later in the code ... + * * $( 'textarea' ).ckeditor(); * // ... Index: /CKEditor/branches/versions/3.6.x/_source/core/_bootstrap.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/_bootstrap.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/_bootstrap.js (revision 6660) @@ -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 */ @@ -17,17 +17,8 @@ } - // Check is High Contrast is active by creating a temporary element with a - // background image. - - var useSpacer = CKEDITOR.env.ie && CKEDITOR.env.version < 7, - useBlank = CKEDITOR.env.ie && CKEDITOR.env.version == 7; - - var backgroundImageUrl = useSpacer ? ( CKEDITOR.basePath + 'images/spacer.gif' ) : - useBlank ? 'about:blank' : 'data:image/png;base64,'; - + // Check whether high contrast is active by creating a colored border. var hcDetect = CKEDITOR.dom.element.createFromHtml( - '

', CKEDITOR.document ); + '

', CKEDITOR.document ); hcDetect.appendTo( CKEDITOR.document.getHead() ); @@ -37,5 +28,5 @@ try { - CKEDITOR.env.hc = ( hcDetect.getComputedStyle( 'background-image' ) == 'none' ); + CKEDITOR.env.hc = hcDetect.getComputedStyle( 'border-top-color' ) == hcDetect.getComputedStyle( 'border-right-color' ); } catch (e) Index: Editor/branches/versions/3.6.x/_source/core/ajax.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/ajax.js (revision 6659) +++ (revision ) @@ -1,142 +1,0 @@ -/* -Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. -For licensing, see LICENSE.html or http://ckeditor.com/license -*/ - -/** - * @fileOverview Defines the {@link CKEDITOR.ajax} object, which holds ajax methods for - * data loading. - */ - -/** - * @namespace Ajax methods for data loading. - * @example - */ -CKEDITOR.ajax = (function() -{ - var createXMLHttpRequest = function() - { - // In IE, using the native XMLHttpRequest for local files may throw - // "Access is Denied" errors. - if ( !CKEDITOR.env.ie || location.protocol != 'file:' ) - try { return new XMLHttpRequest(); } catch(e) {} - - try { return new ActiveXObject( 'Msxml2.XMLHTTP' ); } catch (e) {} - try { return new ActiveXObject( 'Microsoft.XMLHTTP' ); } catch (e) {} - - return null; - }; - - var checkStatus = function( xhr ) - { - // HTTP Status Codes: - // 2xx : Success - // 304 : Not Modified - // 0 : Returned when running locally (file://) - // 1223 : IE may change 204 to 1223 (see http://dev.jquery.com/ticket/1450) - - return ( xhr.readyState == 4 && - ( ( xhr.status >= 200 && xhr.status < 300 ) || - xhr.status == 304 || - xhr.status === 0 || - xhr.status == 1223 ) ); - }; - - var getResponseText = function( xhr ) - { - if ( checkStatus( xhr ) ) - return xhr.responseText; - return null; - }; - - var getResponseXml = function( xhr ) - { - if ( checkStatus( xhr ) ) - { - var xml = xhr.responseXML; - return new CKEDITOR.xml( xml && xml.firstChild ? xml : xhr.responseText ); - } - return null; - }; - - var load = function( url, callback, getResponseFn ) - { - var async = !!callback; - - var xhr = createXMLHttpRequest(); - - if ( !xhr ) - return null; - - xhr.open( 'GET', url, async ); - - if ( async ) - { - // TODO: perform leak checks on this closure. - /** @ignore */ - xhr.onreadystatechange = function() - { - if ( xhr.readyState == 4 ) - { - callback( getResponseFn( xhr ) ); - xhr = null; - } - }; - } - - xhr.send(null); - - return async ? '' : getResponseFn( xhr ); - }; - - return /** @lends CKEDITOR.ajax */ { - - /** - * Loads data from an URL as plain text. - * @param {String} url The URL from which load data. - * @param {Function} [callback] A callback function to be called on - * data load. If not provided, the data will be loaded - * asynchronously, passing the data value the function on load. - * @returns {String} The loaded data. For asynchronous requests, an - * empty string. For invalid requests, null. - * @example - * // Load data synchronously. - * var data = CKEDITOR.ajax.load( 'somedata.txt' ); - * alert( data ); - * @example - * // Load data asynchronously. - * var data = CKEDITOR.ajax.load( 'somedata.txt', function( data ) - * { - * alert( data ); - * } ); - */ - load : function( url, callback ) - { - return load( url, callback, getResponseText ); - }, - - /** - * Loads data from an URL as XML. - * @param {String} url The URL from which load data. - * @param {Function} [callback] A callback function to be called on - * data load. If not provided, the data will be loaded - * asynchronously, passing the data value the function on load. - * @returns {CKEDITOR.xml} An XML object holding the loaded data. For asynchronous requests, an - * empty string. For invalid requests, null. - * @example - * // Load XML synchronously. - * var xml = CKEDITOR.ajax.loadXml( 'somedata.xml' ); - * alert( xml.getInnerXml( '//' ) ); - * @example - * // Load XML asynchronously. - * var data = CKEDITOR.ajax.loadXml( 'somedata.xml', function( xml ) - * { - * alert( xml.getInnerXml( '//' ) ); - * } ); - */ - loadXml : function( url, callback ) - { - return load( url, callback, getResponseXml ); - } - }; -})(); Index: /CKEditor/branches/versions/3.6.x/_source/core/ckeditor.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/ckeditor.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/ckeditor.js (revision 6660) @@ -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.6.x/_source/core/ckeditor_base.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/ckeditor_base.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/ckeditor_base.js (revision 6660) @@ -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 */ @@ -10,5 +10,5 @@ // #### Compressed Code -// Must be updated on changes in the script, as well as updated in the +// Must be updated on changes in the script as well as updated in the // ckeditor_source.js and ckeditor_basic_source.js files. @@ -34,5 +34,5 @@ * A constant string unique for each release of CKEditor. Its value * is used, by default, to build the URL for all resources loaded - * by the editor code, guaranteing clean cache results when + * by the editor code, guaranteeing clean cache results when * upgrading. * @type String @@ -43,5 +43,5 @@ /* // %REMOVE_LINE% // The production implementation contains a fixed timestamp, unique - // for each release, generated by the releaser. + // for each release and generated by the releaser. // (Base 36 value of each component of YYMMDDHH - 4 chars total - e.g. 87bm == 08071122) timestamp : '%TIMESTAMP%', @@ -67,5 +67,5 @@ /** - * Private object used to hold core stuff. It should not be used out of + * Private object used to hold core stuff. It should not be used outside of * the API code as properties defined here may change at any time * without notice. @@ -75,5 +75,5 @@ /** - * Indicates the API loading status. The following status are available: + * Indicates the API loading status. The following statuses are available: *

unloaded: the API is not yet loaded.
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.

* @type String * @example - * if ( CKEDITOR.status == 'ready' ) + * if ( CKEDITOR.status == 'loaded' ) * { * // The API can now be fully used. @@ -94,7 +94,7 @@ /** * Contains the full URL for the CKEditor installation directory. - * It's possible to manually provide the base path by setting a + * It is possible to manually provide the base path by setting a * global variable named CKEDITOR_BASEPATH. This global variable - * must be set "before" the editor script loading. + * must be set before the editor script loading. * @type String * @example @@ -103,5 +103,5 @@ basePath : (function() { - // ATTENTION: fixes on this code must be ported to + // ATTENTION: fixes to this code must be ported to // var basePath in "core/loader.js". @@ -125,6 +125,6 @@ } - // In IE (only) the script.src string is the raw valued entered in the - // HTML. Other browsers return the full resolved URL instead. + // In IE (only) the script.src string is the raw value entered in the + // HTML source. Other browsers return the full resolved URL instead. if ( path.indexOf(':/') == -1 ) { @@ -145,14 +145,14 @@ /** * Gets the full URL for CKEditor resources. By default, URLs - * returned by this function contains a querystring parameter ("t") + * returned by this function contain a querystring parameter ("t") * set to the {@link CKEDITOR.timestamp} value.
*
- * It's possible to provide a custom implementation to this + * It is possible to provide a custom implementation of this * function by setting a global variable named CKEDITOR_GETURL. - * This global variable must be set "before" the editor script + * This global variable must be set before the editor script * loading. If the custom implementation returns nothing (==null), the * default implementation is used. - * @param {String} resource The resource to which get the full URL. - * It may be a full, absolute or relative URL. + * @param {String} resource The resource whose full URL we want to get. + * It may be a full, absolute, or relative URL. * @returns {String} The full URL. * @example @@ -197,3 +197,25 @@ } +/** + * Function called upon loading a custom configuration file that can + * modify the editor instance configuration ({@link CKEDITOR.editor#config }). + * It is usually defined inside the custom configuration files that can + * include developer defined settings. + * @name CKEDITOR.editorConfig + * @function + * @param {CKEDITOR.config} config A configuration object containing the + * settings defined for a {@link CKEDITOR.editor} instance up to this + * function call. Note that not all settings may still be available. See + * Configuration Loading Order + * for details. + * @example + * // This is supposed to be placed in the config.js file. + * CKEDITOR.editorConfig = function( config ) + * { + * // Define changes to default configuration here. For example: + * config.language = 'fr'; + * config.uiColor = '#AADC6E'; + * }; + */ + // PACKAGER_RENAME( CKEDITOR ) Index: /CKEditor/branches/versions/3.6.x/_source/core/ckeditor_basic.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/ckeditor_basic.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/ckeditor_basic.js (revision 6660) @@ -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 */ @@ -174,6 +174,5 @@ { var config = null, - textarea = textareas[i], - name = textarea.name; + textarea = textareas[i]; // The "name" and/or "id" attribute must exist. Index: /CKEditor/branches/versions/3.6.x/_source/core/command.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/command.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/command.js (revision 6660) @@ -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 */ @@ -189,5 +189,5 @@ /** - * Indicates the preivous command state. + * Indicates the previous command state. * @name CKEDITOR.command.prototype.previousState * @type Number Index: /CKEditor/branches/versions/3.6.x/_source/core/commanddefinition.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/commanddefinition.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/commanddefinition.js (revision 6660) @@ -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.6.x/_source/core/config.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/config.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/config.js (revision 6660) @@ -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.6.x/_source/core/dataprocessor.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/dataprocessor.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/dataprocessor.js (revision 6660) @@ -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.6.x/_source/core/dom.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/dom.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/dom.js (revision 6660) @@ -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.6.x/_source/core/dom/comment.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/dom/comment.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/dom/comment.js (revision 6660) @@ -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.6.x/_source/core/dom/document.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/dom/document.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/dom/document.js (revision 6660) @@ -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.6.x/_source/core/dom/documentfragment.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/dom/documentfragment.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/dom/documentfragment.js (revision 6660) @@ -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.6.x/_source/core/dom/domobject.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/dom/domobject.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/dom/domobject.js (revision 6660) @@ -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.6.x/_source/core/dom/element.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/dom/element.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/dom/element.js (revision 6660) @@ -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 */ @@ -308,4 +308,5 @@ /** * Moves the selection focus to this element. + * @function * @param {Boolean} defer Whether to asynchronously defer the * execution by 100 ms. @@ -453,5 +454,6 @@ case 'hspace': - return this.$.hspace; + case 'value': + return this.$[ name ]; case 'style': @@ -816,12 +818,13 @@ /** - * Indicates that the element has defined attributes. + * Checks if the element has any defined attributes. + * @function * @returns {Boolean} True if the element has attributes. * @example - * var element = CKEDITOR.dom.element.createFromHtml( '

Example

' ); - * alert( element.hasAttributes() ); "true" - * @example - * var element = CKEDITOR.dom.element.createFromHtml( '

Example

' ); - * alert( element.hasAttributes() ); "false" + * var element = CKEDITOR.dom.element.createFromHtml( '<div title="Test">Example</div>' ); + * alert( element.hasAttributes() ); // "true" + * @example + * var element = CKEDITOR.dom.element.createFromHtml( '<div>Example</div>' ); + * alert( element.hasAttributes() ); // "false" */ hasAttributes : @@ -877,7 +880,7 @@ /** - * Indicates whether a specified attribute is defined for this element. + * Checks if the specified attribute is defined for this element. * @returns {Boolean} True if the specified attribute is defined. - * @param (String) name The attribute name. + * @param {String} name The attribute name. * @example */ @@ -921,4 +924,12 @@ }, + /** + * Merges sibling elements that are identical to this one.
+ *
+ * Identical child elements are also merged. For example:
+ * <b><i></i></b><b><i></i></b> => <b><i></i></b> + * @function + * @param {Boolean} [inlineOnly] Allow only inline elements to be merged. Defaults to "true". + */ mergeSiblings : ( function() { @@ -960,9 +971,12 @@ } - return function() - { - // Merge empty links and anchors also. (#5567) - if ( !( CKEDITOR.dtd.$removeEmpty[ this.getName() ] || this.is( 'a' ) ) ) + return function( inlineOnly ) + { + if ( ! ( inlineOnly === false + || CKEDITOR.dtd.$removeEmpty[ this.getName() ] + || this.is( 'a' ) ) ) // Merge empty links and anchors also. (#5567) + { return; + } mergeElements( this, this.getNext(), true ); @@ -1548,7 +1562,10 @@ /** * Gets, sets and removes custom data to be stored as HTML5 data-* attributes. - * @name CKEDITOR.dom.element.data - * @param {String} name The name of the attribute, execluding the 'data-' part. + * @param {String} name The name of the attribute, excluding the 'data-' part. * @param {String} [value] The value to set. If set to false, the attribute will be removed. + * @example + * element.data( 'extra-info', 'test' ); // appended the attribute data-extra-info="test" to the element + * alert( element.data( 'extra-info' ) ); // "test" + * element.data( 'extra-info', false ); // remove the data-extra-info attribute from the element */ data : function ( name, value ) @@ -1561,4 +1578,6 @@ else this.setAttribute( name, value ); + + return null; } }); @@ -1580,9 +1599,10 @@ /** - * Update the element's size with box model awareness. - * @name CKEDITOR.dom.element.setSize - * @param {String} type [width|height] + * Sets the element size considering the box model. + * @name CKEDITOR.dom.element.prototype.setSize + * @function + * @param {String} type The dimension to set. It accepts "width" and "height". * @param {Number} size The length unit in px. - * @param isBorderBox Apply the {@param width} and {@param height} based on border box model. + * @param {Boolean} isBorderBox Apply the size based on the border box model. */ CKEDITOR.dom.element.prototype.setSize = function( type, size, isBorderBox ) @@ -1598,15 +1618,16 @@ /** - * Get the element's size, possibly with box model awareness. - * @name CKEDITOR.dom.element.getSize - * @param {String} type [width|height] - * @param {Boolean} contentSize Get the {@param width} or {@param height} based on border box model. + * Gets the element size, possibly considering the box model. + * @name CKEDITOR.dom.element.prototype.getSize + * @function + * @param {String} type The dimension to get. It accepts "width" and "height". + * @param {Boolean} isBorderBox Get the size based on the border box model. */ - CKEDITOR.dom.element.prototype.getSize = function( type, contentSize ) + CKEDITOR.dom.element.prototype.getSize = function( type, isBorderBox ) { var size = Math.max( this.$[ 'offset' + CKEDITOR.tools.capitalize( type ) ], this.$[ 'client' + CKEDITOR.tools.capitalize( type ) ] ) || 0; - if ( contentSize ) + if ( isBorderBox ) size -= marginAndPaddingSize.call( this, type ); Index: /CKEditor/branches/versions/3.6.x/_source/core/dom/elementpath.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/dom/elementpath.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/dom/elementpath.js (revision 6660) @@ -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 */ @@ -7,8 +7,8 @@ { // Elements that may be considered the "Block boundary" in an element path. - var pathBlockElements = { address:1,blockquote:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,li:1,dt:1,dd:1 }; + var pathBlockElements = { address:1,blockquote:1,dl:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,li:1,dt:1,dd:1, legend:1 }; // Elements that may be considered the "Block limit" in an element path. - var pathBlockLimitElements = { body:1,div:1,table:1,tbody:1,tr:1,td:1,th:1,caption:1,form:1 }; + var pathBlockLimitElements = { body:1,div:1,table:1,tbody:1,tr:1,td:1,th:1,caption:1,form:1,fieldset:1 }; // Check if an element contains any block element. Index: /CKEditor/branches/versions/3.6.x/_source/core/dom/event.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/dom/event.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/dom/event.js (revision 6660) @@ -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.6.x/_source/core/dom/node.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/dom/node.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/dom/node.js (revision 6660) @@ -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 */ @@ -205,27 +205,10 @@ { var parentNode = node.parentNode; - var currentIndex = -1; if ( parentNode ) { - for ( var i = 0 ; i < parentNode.childNodes.length ; i++ ) - { - var candidate = parentNode.childNodes[i]; - - if ( normalized && - candidate.nodeType == 3 && - candidate.previousSibling && - candidate.previousSibling.nodeType == 3 ) - { - continue; - } - - currentIndex++; - - if ( candidate == node ) - break; - } - - address.unshift( currentIndex ); + // Get the node index. For performance, call getIndex + // directly, instead of creating a new node object. + address.unshift( this.getIndex.call( { $ : node }, normalized ) ); } @@ -248,22 +231,26 @@ }, - getIndex : function() - { - var $ = this.$; - - var currentNode = $.parentNode && $.parentNode.firstChild; - var currentIndex = -1; - - while ( currentNode ) - { - currentIndex++; - - if ( currentNode == $ ) - return currentIndex; - - currentNode = currentNode.nextSibling; - } - - return -1; + getIndex : function( normalized ) + { + // Attention: getAddress depends on this.$ + + var current = this.$, + index = 0; + + while ( ( current = current.previousSibling ) ) + { + // When normalizing, do not count it if this is an + // empty text node or if it's a text node following another one. + if ( normalized && current.nodeType == 3 && + ( !current.nodeValue.length || + ( current.previousSibling && current.previousSibling.nodeType == 3 ) ) ) + { + continue; + } + + index++; + } + + return index; }, @@ -501,9 +488,16 @@ /** - * Gets the closes ancestor node of a specified node name. - * @param {String} name Node name of ancestor node. - * @param {Boolean} includeSelf (Optional) Whether to include the current - * node in the calculation or not. - * @returns {CKEDITOR.dom.node} Ancestor node. + * Gets the closest ancestor node of this node, specified by its node name. + * @param {String} name The node name of the ancestor node to search. + * @param {Boolean} [includeSelf] Whether to include the current + * node in the search. + * @returns {CKEDITOR.dom.node} The located ancestor node or null if not found. + * @example + * // Suppose we have the following HTML: + * // <div id="outer"><div id="inner"><p><b>Some text</b></p></div></div> + * // If node == <b> + * ascendant = node.getAscendant( 'div' ); // ascendant == <div id="inner"> + * ascendant = node.getAscendant( 'b' ); // ascendant == null + * ascendant = node.getAscendant( 'b', true ); // ascendant == <b> */ getAscendant : function( name, includeSelf ) @@ -665,11 +659,11 @@ * @example * // For the following HTML: - * //

Some text

+ * // <div contenteditable="false">Some <b>text</b></div> * - * // If "ele" is the above

- * 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 <b> + * ele.isReadOnly(); // the <div> element */ isReadOnly : function() @@ -680,5 +674,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.6.x/_source/core/dom/nodelist.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/dom/nodelist.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/dom/nodelist.js (revision 6660) @@ -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.6.x/_source/core/dom/range.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/dom/range.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/dom/range.js (revision 6660) @@ -1,18 +1,89 @@ /* -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 */ /** - * @class + * Creates a CKEDITOR.dom.range instance that can be used inside a specific + * DOM Document. + * @class Represents a delimited piece of content in a DOM Document. + * It is contiguous in the sense that it can be characterized as selecting all + * of the content between a pair of boundary-points.
+ *
+ * This class shares much of the W3C + * Document Object Model Range + * ideas and features, adding several range manipulation tools to it, but it's + * not intended to be compatible with it. + * @param {CKEDITOR.dom.document} document The document into which the range + * features will be available. + * @example + * // Create a range for the entire contents of the editor document body. + * var range = new CKEDITOR.dom.range( editor.document ); + * range.selectNodeContents( editor.document.getBody() ); + * // Delete the contents. + * range.deleteContents(); */ CKEDITOR.dom.range = function( document ) { + /** + * Node within which the range begins. + * @type {CKEDITOR.NODE_ELEMENT|CKEDITOR.NODE_TEXT} + * @example + * var range = new CKEDITOR.dom.range( editor.document ); + * range.selectNodeContents( editor.document.getBody() ); + * alert( range.startContainer.getName() ); // "body" + */ this.startContainer = null; + + /** + * Offset within the starting node of the range. + * @type {Number} + * @example + * var range = new CKEDITOR.dom.range( editor.document ); + * range.selectNodeContents( editor.document.getBody() ); + * alert( range.startOffset ); // "0" + */ this.startOffset = null; + + /** + * Node within which the range ends. + * @type {CKEDITOR.NODE_ELEMENT|CKEDITOR.NODE_TEXT} + * @example + * var range = new CKEDITOR.dom.range( editor.document ); + * range.selectNodeContents( editor.document.getBody() ); + * alert( range.endContainer.getName() ); // "body" + */ this.endContainer = null; + + /** + * Offset within the ending node of the range. + * @type {Number} + * @example + * var range = new CKEDITOR.dom.range( editor.document ); + * range.selectNodeContents( editor.document.getBody() ); + * alert( range.endOffset ); // == editor.document.getBody().getChildCount() + */ this.endOffset = null; + + /** + * Indicates that this is a collapsed range. A collapsed range has it's + * start and end boudaries at the very same point so nothing is contained + * in it. + * @example + * var range = new CKEDITOR.dom.range( editor.document ); + * range.selectNodeContents( editor.document.getBody() ); + * alert( range.collapsed ); // "false" + * range.collapse(); + * alert( range.collapsed ); // "true" + */ this.collapsed = true; + /** + * The document within which the range can be used. + * @type {CKEDITOR.dom.document} + * @example + * // Selects the body contents of the range document. + * range.selectNodeContents( range.document.getBody() ); + */ this.document = document; }; @@ -33,5 +104,5 @@ // contents. // V2 - var execContentsAction = function( range, action, docFrag ) + var execContentsAction = function( range, action, docFrag, mergeThen ) { range.optimizeBookmark(); @@ -248,5 +319,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 +449,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 +462,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; @@ -507,4 +590,8 @@ startOffset = 0; } + + // Get the normalized offset. + if ( child && child.type == CKEDITOR.NODE_ELEMENT ) + startOffset = child.getIndex( 1 ); } @@ -535,4 +622,8 @@ endOffset = 0; } + + // Get the normalized offset. + if ( child && child.type == CKEDITOR.NODE_ELEMENT ) + endOffset = child.getIndex( 1 ); } @@ -812,5 +903,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 +1029,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 +1189,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 +1854,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.6.x/_source/core/dom/rangelist.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/dom/rangelist.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/dom/rangelist.js (revision 6660) @@ -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.6.x/_source/core/dom/text.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/dom/text.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/dom/text.js (revision 6660) @@ -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 */ @@ -68,4 +68,9 @@ }, + setText : function( text ) + { + this.$.nodeValue = text; + }, + /** * Breaks this text node into two nodes at the specified offset, Index: /CKEditor/branches/versions/3.6.x/_source/core/dom/walker.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/dom/walker.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/dom/walker.js (revision 6660) @@ -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.6.x/_source/core/dom/window.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/dom/window.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/dom/window.js (revision 6660) @@ -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.6.x/_source/core/dtd.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/dtd.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/dtd.js (revision 6660) @@ -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.6.x/_source/core/editor.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/editor.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/editor.js (revision 6660) @@ -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 */ @@ -273,5 +273,5 @@ lang = ( CKEDITOR.tools.indexOf( pluginLangs, editor.langCode ) >= 0 ? editor.langCode : pluginLangs[ 0 ] ); - if ( !plugin.lang[ lang ] ) + if ( !plugin.langEntries || !plugin.langEntries[ lang ] ) { // Put the language file URL into the list of files to @@ -281,5 +281,5 @@ else { - CKEDITOR.tools.extend( editor.lang, plugin.lang[ lang ] ); + CKEDITOR.tools.extend( editor.lang, plugin.langEntries[ lang ] ); lang = null; } @@ -306,5 +306,5 @@ // Uses the first loop to update the language entries also. if ( m === 0 && languageCodes[ i ] && plugin.lang ) - CKEDITOR.tools.extend( editor.lang, plugin.lang[ languageCodes[ i ] ] ); + CKEDITOR.tools.extend( editor.lang, plugin.langEntries[ languageCodes[ i ] ] ); // Call the plugin method (beforeInit and init). @@ -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,42 +548,7 @@ 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.fire( 'destroy' ); + this.theme && this.theme.destroy( this ); + CKEDITOR.remove( this ); CKEDITOR.fire( 'instanceDestroyed', null, this ); @@ -720,4 +685,5 @@ * @param {Function} callback Function to be called after the setData * is completed. + *@param {Boolean} internal Whether suppress any event firing when copying data internally inside editor. * @example * CKEDITOR.instances.editor1.setData( '<p>This is the editor data.</p>' ); @@ -728,5 +694,5 @@ * }); */ - setData : function( data , callback ) + setData : function( data , callback, internal ) { if( callback ) @@ -741,9 +707,9 @@ // Fire "setData" so data manipulation may happen. var eventData = { dataValue : data }; - this.fire( 'setData', eventData ); + !internal && this.fire( 'setData', eventData ); this._.data = eventData.dataValue; - this.fire( 'afterSetData', eventData ); + !internal && this.fire( 'afterSetData', eventData ); }, @@ -893,7 +859,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 +908,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.6.x/_source/core/editor_basic.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/editor_basic.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/editor_basic.js (revision 6660) @@ -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.6.x/_source/core/env.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/env.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/env.js (revision 6660) @@ -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 */ @@ -145,4 +145,14 @@ */ env.ie8Compat = document.documentMode == 8; + + /** + * Indicates that CKEditor is running on Internet Explorer 9's standards mode. + * @name CKEDITOR.env.ie9Compat + * @type Boolean + * @example + * if ( CKEDITOR.env.ie9Compat ) + * alert( "IE9, the beauty of the web!" ); + */ + env.ie9Compat = document.documentMode == 9; /** Index: /CKEditor/branches/versions/3.6.x/_source/core/event.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/event.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/event.js (revision 6660) @@ -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.6.x/_source/core/eventInfo.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/eventInfo.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/eventInfo.js (revision 6660) @@ -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.6.x/_source/core/focusmanager.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/focusmanager.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/focusmanager.js (revision 6660) @@ -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.6.x/_source/core/htmlparser.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/htmlparser.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/htmlparser.js (revision 6660) @@ -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.6.x/_source/core/htmlparser/basicwriter.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/htmlparser/basicwriter.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/htmlparser/basicwriter.js (revision 6660) @@ -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.6.x/_source/core/htmlparser/cdata.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/htmlparser/cdata.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/htmlparser/cdata.js (revision 6660) @@ -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.6.x/_source/core/htmlparser/comment.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/htmlparser/comment.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/htmlparser/comment.js (revision 6660) @@ -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.6.x/_source/core/htmlparser/element.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/htmlparser/element.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/htmlparser/element.js (revision 6660) @@ -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 */ @@ -35,9 +35,18 @@ this.children = []; - var tagName = attributes[ 'data-cke-real-element-type' ] || name; + 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; @@ -119,5 +128,5 @@ var writer = new CKEDITOR.htmlParser.basicWriter(); CKEDITOR.htmlParser.fragment.prototype.writeChildrenHtml.call( element, writer, filter ); - element.children = new CKEDITOR.htmlParser.fragment.fromHtml( writer.getHtml() ).children; + element.children = new CKEDITOR.htmlParser.fragment.fromHtml( writer.getHtml(), 0, element.clone() ).children; isChildrenFiltered = 1; } Index: /CKEditor/branches/versions/3.6.x/_source/core/htmlparser/filter.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/htmlparser/filter.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/htmlparser/filter.js (revision 6660) @@ -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.6.x/_source/core/htmlparser/fragment.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/htmlparser/fragment.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/htmlparser/fragment.js (revision 6660) @@ -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 */ @@ -38,14 +38,12 @@ (function() { - // Elements which the end tag is marked as optional in the HTML 4.01 DTD - // (expect empty elements). - var optionalClose = {colgroup:1,dd:1,dt:1,li:1,option:1,p:1,td:1,tfoot:1,th:1,thead:1,tr:1}; - // Block-level elements whose internal structure should be respected during // parser fixing. - var nonBreakingBlocks = CKEDITOR.tools.extend( - {table:1,ul:1,ol:1,dl:1}, - CKEDITOR.dtd.table, CKEDITOR.dtd.ul, CKEDITOR.dtd.ol, CKEDITOR.dtd.dl ), - listBlocks = CKEDITOR.dtd.$list, listItems = CKEDITOR.dtd.$listItem; + var nonBreakingBlocks = CKEDITOR.tools.extend( { table:1,ul:1,ol:1,dl:1 }, CKEDITOR.dtd.table, CKEDITOR.dtd.ul, CKEDITOR.dtd.ol, CKEDITOR.dtd.dl ); + + var listBlocks = { ol:1, ul:1 }; + + // Dtd of the fragment element, basically it accept anything except for intermediate structure, e.g. orphan
. + var rootDtd = CKEDITOR.tools.extend( {}, { html: 1 }, CKEDITOR.dtd.html, CKEDITOR.dtd.body, CKEDITOR.dtd.head, { style:1,script:1 } ); /** @@ -53,4 +51,5 @@ * @param {String} fragmentHtml The HTML to be parsed, filling the fragment. * @param {Number} [fixForBody=false] Wrap body with specified element if needed. + * @param {CKEDITOR.htmlParser.element} contextNode Parse the html as the content of this element. * @returns CKEDITOR.htmlParser.fragment The fragment created. * @example @@ -59,15 +58,13 @@ * alert( fragment.children[1].value ); " Text" */ - CKEDITOR.htmlParser.fragment.fromHtml = function( fragmentHtml, fixForBody ) + CKEDITOR.htmlParser.fragment.fromHtml = function( fragmentHtml, fixForBody, contextNode ) { var parser = new CKEDITOR.htmlParser(), - html = [], - fragment = new CKEDITOR.htmlParser.fragment(), + fragment = contextNode || new CKEDITOR.htmlParser.fragment(), pendingInline = [], pendingBRs = [], currentNode = fragment, // Indicate we're inside a
element, spaces should be touched differently. - inPre = false, - returnPoint; + inPre = false; function checkPending( newTagName ) @@ -109,17 +106,35 @@ } - function sendPendingBRs( brsToIgnore ) - { - while ( pendingBRs.length - ( brsToIgnore || 0 ) > 0 ) + function sendPendingBRs() + { + while ( pendingBRs.length ) currentNode.add( pendingBRs.shift() ); } - function addElement( element, target, enforceCurrent ) - { + /* + * Beside of simply append specified element to target, this function also takes + * care of other dirty lifts like forcing block in body, trimming spaces at + * the block boundaries etc. + * + * @param {Element} element The element to be added as the last child of {@link target}. + * @param {Element} target The parent element to relieve the new node. + * @param {Boolean} [moveCurrent=false] Don't change the "currentNode" global unless + * there's a return point node specified on the element, otherwise move current onto {@link target} node. + */ + function addElement( element, target, moveCurrent ) + { + // Ignore any element that has already been added. + if ( element.previous !== undefined ) + return; + target = target || currentNode || fragment; - // If the target is the fragment and this element can't go inside + // Current element might be mangled by fix body below, + // save it for restore later. + var savedCurrent = currentNode; + + // If the target is the fragment and this inline element can't go inside // body (if fixForBody). - if ( fixForBody && !target.type ) + if ( fixForBody && ( !target.type || target.name == 'body' ) ) { var elementName, realElementName; @@ -130,10 +145,7 @@ else elementName = element.name; - if ( elementName - && !( elementName in CKEDITOR.dtd.$body ) - && !( elementName in CKEDITOR.dtd.$nonBodyContent ) ) - { - var savedCurrent = currentNode; - + + if ( elementName && !( elementName in CKEDITOR.dtd.$body || elementName == 'body' || element.isOrphan ) ) + { // Create a
in the fragment. currentNode = target; @@ -141,8 +153,5 @@ // The new target now is the
. - target = currentNode; - - if ( enforceCurrent ) - currentNode = savedCurrent; + element.returnPoint = target = currentNode; } } @@ -172,7 +181,9 @@ delete element.returnPoint; } + else + currentNode = moveCurrent ? target : savedCurrent; } - parser.onTagOpen = function( tagName, attributes, selfClosing ) + parser.onTagOpen = function( tagName, attributes, selfClosing, optionalClose ) { var element = new CKEDITOR.htmlParser.element( tagName, attributes ); @@ -183,4 +194,6 @@ element.isEmpty = true; + element.isOptionalClose = optionalClose; + // This is a tag to be removed if empty, so do not add it immediately. if ( CKEDITOR.dtd.$removeEmpty[ tagName ] ) @@ -203,79 +216,69 @@ } - var currentName = currentNode.name; - - var currentDtd = currentName - && ( CKEDITOR.dtd[ currentName ] - || ( currentNode._.isBlockLike ? CKEDITOR.dtd.div : CKEDITOR.dtd.span ) ); - - // If the element cannot be child of the current element. - if ( currentDtd // Fragment could receive any elements. - && !element.isUnknown && !currentNode.isUnknown && !currentDtd[ tagName ] ) - { - - var reApply = false, - addPoint; // New position to start adding nodes. - - // Fixing malformed nested lists by moving it into a previous list item. (#3828) - if ( tagName in listBlocks - && currentName in listBlocks ) - { - var children = currentNode.children, - lastChild = children[ children.length - 1 ]; - - // Establish the list item if it's not existed. - if ( !( lastChild && lastChild.name in listItems ) ) - addElement( ( lastChild = new CKEDITOR.htmlParser.element( 'li' ) ), currentNode ); - - returnPoint = currentNode, addPoint = lastChild; - } - // If the element name is the same as the current element name, - // then just close the current one and append the new one to the - // parent. This situation usually happens with
,
,
and - //
, specially in IE. Do not enter in this if block in this case. - else if ( tagName == currentName ) - { - addElement( currentNode, currentNode.parent ); - } - else if ( tagName in CKEDITOR.dtd.$listItem ) - { - parser.onTagOpen( 'ul', {} ); - addPoint = currentNode; - reApply = true; - } - else - { - if ( nonBreakingBlocks[ currentName ] ) + while( 1 ) + { + var currentName = currentNode.name; + + var currentDtd = currentName ? ( CKEDITOR.dtd[ currentName ] + || ( currentNode._.isBlockLike ? CKEDITOR.dtd.div : CKEDITOR.dtd.span ) ) + : rootDtd; + + // If the element cannot be child of the current element. + if ( !element.isUnknown && !currentNode.isUnknown && !currentDtd[ tagName ] ) + { + // Current node doesn't have a close tag, time for a close + // as this element isn't fit in. (#7497) + if ( currentNode.isOptionalClose ) + parser.onTagClose( currentName ); + // Fixing malformed nested lists by moving it into a previous list item. (#3828) + else if ( tagName in listBlocks + && currentName in listBlocks ) { - if ( !returnPoint ) - returnPoint = currentNode; + var children = currentNode.children, + lastChild = children[ children.length - 1 ]; + + // Establish the list item if it's not existed. + if ( !( lastChild && lastChild.name == 'li' ) ) + addElement( ( lastChild = new CKEDITOR.htmlParser.element( 'li' ) ), currentNode ); + + !element.returnPoint && ( element.returnPoint = currentNode ); + currentNode = lastChild; + } + // Establish new list root for orphan list items. + else if ( tagName in CKEDITOR.dtd.$listItem && currentName != tagName ) + parser.onTagOpen( tagName == 'li' ? 'ul' : 'dl', {}, 0, 1 ); + // We're inside a structural block like table and list, AND the incoming element + // is not of the same type (e.g. td1td2), we simply add this new one before it, + // and most importantly, return back to here once this element is added, + // e.g.
p1
td1 td2
+ else if ( currentName in nonBreakingBlocks && currentName != tagName ) + { + !element.returnPoint && ( element.returnPoint = currentNode ); + currentNode = currentNode.parent; } else { - addElement( currentNode, currentNode.parent, true ); - - if ( !optionalClose[ currentName ] ) + // The current element is an inline element, which + // need to be continued even after the close, so put + // it in the pending list. + if ( currentName in CKEDITOR.dtd.$inline ) + pendingInline.unshift( currentNode ); + + // The most common case where we just need to close the + // current one and append the new one to the parent. + if ( currentNode.parent ) + addElement( currentNode, currentNode.parent, 1 ); + // We've tried our best to fix the embarrassment here, while + // this element still doesn't find it's parent, mark it as + // orphan and show our tolerance to it. + else { - // The current element is an inline element, which - // cannot hold the new one. Put it in the pending list, - // and try adding the new one after it. - pendingInline.unshift( currentNode ); + element.isOrphan = 1; + break; } } - - reApply = true; - } - - if ( addPoint ) - currentNode = addPoint; - // Try adding it to the return point, or the parent element. + } else - currentNode = currentNode.returnPoint || currentNode.parent; - - if ( reApply ) - { - parser.onTagOpen.apply( this, arguments ); - return; - } + break; } @@ -284,6 +287,4 @@ element.parent = currentNode; - element.returnPoint = returnPoint; - returnPoint = 0; if ( element.isEmpty ) @@ -310,5 +311,5 @@ candidate = currentNode; - while ( candidate.type && candidate.name != tagName ) + while ( candidate != fragment && candidate.name != tagName ) { // If this is an inline element, add it to the pending list, if we're @@ -323,8 +324,9 @@ pendingAdd.push( candidate ); - candidate = candidate.parent; - } - - if ( candidate.type ) + // Make sure return point is properly restored. + candidate = candidate.returnPoint || candidate.parent; + } + + if ( candidate != fragment ) { // Add all elements that have been found in the above loop. @@ -375,5 +377,5 @@ && CKEDITOR.tools.trim( text ) ) { - this.onTagOpen( fixForBody, {} ); + this.onTagOpen( fixForBody, {}, 0, 1 ); } @@ -393,4 +395,5 @@ parser.onComment = function( comment ) { + sendPendingBRs(); checkPending(); currentNode.add( new CKEDITOR.htmlParser.comment( comment ) ); @@ -403,22 +406,7 @@ sendPendingBRs( !CKEDITOR.env.ie && 1 ); - // Close all pending nodes. - while ( currentNode.type ) - { - var parent = currentNode.parent, - node = currentNode; - - if ( fixForBody - && ( !parent.type || parent.name == 'body' ) - && !CKEDITOR.dtd.$body[ node.name ] ) - { - currentNode = parent; - parser.onTagOpen( fixForBody, {} ); - parent = currentNode; - } - - parent.add( node ); - currentNode = parent; - } + // Close all pending nodes, make sure return point is properly restored. + while ( currentNode != fragment ) + addElement( currentNode, currentNode.parent, 1 ); return fragment; Index: /CKEditor/branches/versions/3.6.x/_source/core/htmlparser/text.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/htmlparser/text.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/htmlparser/text.js (revision 6660) @@ -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.6.x/_source/core/lang.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/lang.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/lang.js (revision 6660) @@ -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.6.x/_source/core/loader.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/loader.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/loader.js (revision 6660) @@ -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 */ @@ -25,5 +25,4 @@ { 'core/_bootstrap' : [ 'core/config', 'core/ckeditor', 'core/plugins', 'core/scriptloader', 'core/tools', /* The following are entries that we want to force loading at the end to avoid dependence recursion */ 'core/dom/comment', 'core/dom/elementpath', 'core/dom/text', 'core/dom/rangelist' ], - 'core/ajax' : [ 'core/xml' ], 'core/ckeditor' : [ 'core/ckeditor_basic', 'core/dom', 'core/dtd', 'core/dom/document', 'core/dom/element', 'core/editor', 'core/event', 'core/htmlparser', 'core/htmlparser/element', 'core/htmlparser/fragment', 'core/htmlparser/filter', 'core/htmlparser/basicwriter', 'core/tools' ], 'core/ckeditor_base' : [], @@ -67,6 +66,5 @@ 'core/themes' : [ 'core/resourcemanager' ], 'core/tools' : [ 'core/env' ], - 'core/ui' : [], - 'core/xml' : [ 'core/env' ] + 'core/ui' : [] }; Index: /CKEditor/branches/versions/3.6.x/_source/core/plugindefinition.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/plugindefinition.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/plugindefinition.js (revision 6660) @@ -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.6.x/_source/core/plugins.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/plugins.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/plugins.js (revision 6660) @@ -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 */ @@ -80,6 +80,10 @@ { var plugin = this.get( pluginName ), - pluginLang = plugin.lang || ( plugin.lang = {} ); + pluginLangEntries = plugin.langEntries || ( plugin.langEntries = {} ), + pluginLang = plugin.lang || ( plugin.lang = [] ); - pluginLang[ languageCode ] = languageEntries; + if ( CKEDITOR.tools.indexOf( pluginLang, languageCode ) == -1 ) + pluginLang.push( languageCode ); + + pluginLangEntries[ languageCode ] = languageEntries; }; Index: /CKEditor/branches/versions/3.6.x/_source/core/resourcemanager.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/resourcemanager.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/resourcemanager.js (revision 6660) @@ -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.6.x/_source/core/scriptloader.js =================================================================== --- /CKEditor/branches/versions/3.6.x/_source/core/scriptloader.js (revision 6659) +++ /CKEditor/branches/versions/3.6.x/_source/core/scriptloader.js (revision 6660) @@ -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