Index: /CKEditor/branches/versions/3.5.x/_samples/divreplace.html
===================================================================
--- /CKEditor/branches/versions/3.5.x/_samples/divreplace.html (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_samples/divreplace.html (revision 6655)
@@ -53,8 +53,13 @@
// Find out the div that holds this element.
- element = element.parentNode;
+ var name;
+ do
+ {
+ element = element.parentNode;
+ }
+ while ( element && ( name = element.nodeName.toLowerCase() ) && ( name != 'div' || element.className.indexOf( 'editable' ) == -1 ) && name != 'body' )
- if ( element.nodeName.toLowerCase() == 'div'
- && ( element.className.indexOf( 'editable' ) != -1 ) )
+
+ if ( name == 'div' && element.className.indexOf( 'editable' ) != -1 )
replaceDiv( element );
}
Index: /CKEditor/branches/versions/3.5.x/_samples/output_html.html
===================================================================
--- /CKEditor/branches/versions/3.5.x/_samples/output_html.html (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_samples/output_html.html (revision 6655)
@@ -118,6 +118,5 @@
{
element : 'font',
- attributes : { 'color' : '#(color)' },
- overrides : [ { element : 'span', attributes : { 'class' : /^FontColor(?:1|2|3)$/ } } ]
+ attributes : { 'color' : '#(color)' }
},
Index: /CKEditor/branches/versions/3.5.x/_source/adapters/jquery.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/adapters/jquery.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/adapters/jquery.js (revision 6655)
@@ -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>
+ * <!-- Important: The JQuery adapter is loaded *after* setting jqueryOverrideVal -->
+ * <script src="/ckeditor/adapters/jquery.js"></script>
+ * @example
+ * // ... then later in the code ...
+ *
* $( 'textarea' ).ckeditor();
* // ...
Index: /CKEditor/branches/versions/3.5.x/_source/core/_bootstrap.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/core/_bootstrap.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/core/_bootstrap.js (revision 6655)
@@ -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.5.x/_source/core/ajax.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/core/ajax.js (revision 6654)
+++ (revision )
@@ -1,142 +1,0 @@
-/*
-Copyright (c) 2003-2011, 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.5.x/_source/core/ckeditor_base.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/core/ckeditor_base.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/core/ckeditor_base.js (revision 6655)
@@ -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.
@@ -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.5.x/_source/core/ckeditor_basic.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/core/ckeditor_basic.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/core/ckeditor_basic.js (revision 6655)
@@ -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.5.x/_source/core/dom/element.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/core/dom/element.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/core/dom/element.js (revision 6655)
@@ -308,4 +308,5 @@
/**
* Moves the selection focus to this element.
+ * @function
* @param {Boolean} defer Whether to asynchronously defer the
* execution by 100 ms.
@@ -817,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 :
@@ -878,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
*/
@@ -923,5 +925,10 @@
/**
- * @param {Boolean} [inlineOnly=true] Allow only inline elements to be merged.
+ * 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()
@@ -1555,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 )
@@ -1589,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 )
@@ -1607,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.5.x/_source/core/dom/node.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/core/dom/node.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/core/dom/node.js (revision 6655)
@@ -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 )
Index: /CKEditor/branches/versions/3.5.x/_source/core/dom/range.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/core/dom/range.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/core/dom/range.js (revision 6655)
@@ -5,14 +5,85 @@
/**
- * @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;
};
@@ -519,4 +590,8 @@
startOffset = 0;
}
+
+ // Get the normalized offset.
+ if ( child && child.type == CKEDITOR.NODE_ELEMENT )
+ startOffset = child.getIndex( 1 );
}
@@ -547,4 +622,8 @@
endOffset = 0;
}
+
+ // Get the normalized offset.
+ if ( child && child.type == CKEDITOR.NODE_ELEMENT )
+ endOffset = child.getIndex( 1 );
}
Index: /CKEditor/branches/versions/3.5.x/_source/core/dom/text.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/core/dom/text.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/core/dom/text.js (revision 6655)
@@ -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.5.x/_source/core/editor.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/core/editor.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/core/editor.js (revision 6655)
@@ -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).
Index: /CKEditor/branches/versions/3.5.x/_source/core/env.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/core/env.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/core/env.js (revision 6655)
@@ -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.5.x/_source/core/htmlparser/element.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/element.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/element.js (revision 6655)
@@ -35,5 +35,5 @@
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).
@@ -128,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.5.x/_source/core/htmlparser/fragment.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/fragment.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/core/htmlparser/fragment.js (revision 6655)
@@ -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;
+
+ // 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;
@@ -131,8 +146,6 @@
elementName = element.name;
- if ( elementName && elementName in CKEDITOR.dtd.$inline )
- {
- var savedCurrent = currentNode;
-
+ if ( elementName && !( elementName in CKEDITOR.dtd.$body || elementName == 'body' || element.isOrphan ) )
+ {
// Create a
in the fragment.
currentNode = target;
@@ -140,8 +153,5 @@
// The new target now is the
.
- target = currentNode;
-
- if ( enforceCurrent )
- currentNode = savedCurrent;
+ element.returnPoint = target = currentNode;
}
}
@@ -171,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 );
@@ -182,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 ] )
@@ -202,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.
td1
td2
), we simply add this new one before it,
+ // and most importantly, return back to here once this element is added,
+ // e.g.
* This class is not really part of the API. It just illustrates the properties
* that developers can use to define and create dialogs.
- * @name CKEDITOR.dialog.dialogDefinition
+ *
+ * @name CKEDITOR.dialog.definition
* @constructor
* @example
@@ -47,5 +50,5 @@
/**
* The dialog title, displayed in the dialog's header. Required.
- * @name CKEDITOR.dialog.dialogDefinition.prototype.title
+ * @name CKEDITOR.dialog.definition.prototype.title
* @field
* @type String
@@ -60,5 +63,5 @@
* CKEDITOR.DIALOG_RESIZE_HEIGHT
* CKEDITOR.DIALOG_RESIZE_BOTH
- * @name CKEDITOR.dialog.dialogDefinition.prototype.resizable
+ * @name CKEDITOR.dialog.definition.prototype.resizable
* @field
* @type Number
@@ -69,5 +72,5 @@
/**
* The minimum width of the dialog, in pixels.
- * @name CKEDITOR.dialog.dialogDefinition.prototype.minWidth
+ * @name CKEDITOR.dialog.definition.prototype.minWidth
* @field
* @type Number
@@ -78,5 +81,5 @@
/**
* The minimum height of the dialog, in pixels.
- * @name CKEDITOR.dialog.dialogDefinition.prototype.minHeight
+ * @name CKEDITOR.dialog.definition.prototype.minHeight
* @field
* @type Number
@@ -85,8 +88,29 @@
*/
+
+/**
+ * The initial width of the dialog, in pixels.
+ * @name CKEDITOR.dialog.definition.prototype.width
+ * @field
+ * @type Number
+ * @default @CKEDITOR.dialog.definition.prototype.minWidth
+ * @since 3.5.3
+ * @example
+ */
+
+/**
+ * The initial height of the dialog, in pixels.
+ * @name CKEDITOR.dialog.definition.prototype.height
+ * @field
+ * @type Number
+ * @default @CKEDITOR.dialog.definition.prototype.minHeight
+ * @since 3.5.3
+ * @example
+ */
+
/**
* The buttons in the dialog, defined as an array of
- * {@link CKEDITOR.dialog.buttonDefinition} objects.
- * @name CKEDITOR.dialog.dialogDefinition.prototype.buttons
+ * {@link CKEDITOR.dialog.definition.button} objects.
+ * @name CKEDITOR.dialog.definition.prototype.buttons
* @field
* @type Array
@@ -97,6 +121,6 @@
/**
* The contents in the dialog, defined as an array of
- * {@link CKEDITOR.dialog.contentDefinition} objects. Required.
- * @name CKEDITOR.dialog.dialogDefinition.prototype.contents
+ * {@link CKEDITOR.dialog.definition.content} objects. Required.
+ * @name CKEDITOR.dialog.definition.prototype.contents
* @field
* @type Array
@@ -106,5 +130,5 @@
/**
* The function to execute when OK is pressed.
- * @name CKEDITOR.dialog.dialogDefinition.prototype.onOk
+ * @name CKEDITOR.dialog.definition.prototype.onOk
* @field
* @type Function
@@ -114,5 +138,5 @@
/**
* The function to execute when Cancel is pressed.
- * @name CKEDITOR.dialog.dialogDefinition.prototype.onCancel
+ * @name CKEDITOR.dialog.definition.prototype.onCancel
* @field
* @type Function
@@ -122,14 +146,22 @@
/**
* The function to execute when the dialog is displayed for the first time.
- * @name CKEDITOR.dialog.dialogDefinition.prototype.onLoad
- * @field
- * @type Function
- * @example
- */
-
-/**
- * This class is not really part of the API. It just illustrates the properties
- * that developers can use to define and create dialog content pages.
- * @name CKEDITOR.dialog.contentDefinition
+ * @name CKEDITOR.dialog.definition.prototype.onLoad
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * The function to execute when the dialog is loaded (executed every time the dialog is opened).
+ * @name CKEDITOR.dialog.definition.prototype.onShow
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ *
This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create dialog content pages.
+ * @name CKEDITOR.dialog.definition.content
* @constructor
* @example
@@ -140,5 +172,5 @@
/**
* The id of the content page.
- * @name CKEDITOR.dialog.contentDefinition.prototype.id
+ * @name CKEDITOR.dialog.definition.content.prototype.id
* @field
* @type String
@@ -148,5 +180,5 @@
/**
* The tab label of the content page.
- * @name CKEDITOR.dialog.contentDefinition.prototype.label
+ * @name CKEDITOR.dialog.definition.content.prototype.label
* @field
* @type String
@@ -156,5 +188,5 @@
/**
* The popup message of the tab label.
- * @name CKEDITOR.dialog.contentDefinition.prototype.title
+ * @name CKEDITOR.dialog.definition.content.prototype.title
* @field
* @type String
@@ -164,5 +196,5 @@
/**
* The CTRL hotkey for switching to the tab.
- * @name CKEDITOR.dialog.contentDefinition.prototype.accessKey
+ * @name CKEDITOR.dialog.definition.content.prototype.accessKey
* @field
* @type String
@@ -173,6 +205,6 @@
/**
* The UI elements contained in this content page, defined as an array of
- * {@link CKEDITOR.dialog.uiElementDefinition} objects.
- * @name CKEDITOR.dialog.contentDefinition.prototype.elements
+ * {@link CKEDITOR.dialog.definition.uiElement} objects.
+ * @name CKEDITOR.dialog.definition.content.prototype.elements
* @field
* @type Array
@@ -181,135 +213,869 @@
/**
- * This class is not really part of the API. It just illustrates the properties
- * that developers can use to define and create dialog buttons.
- * @name CKEDITOR.dialog.buttonDefinition
- * @constructor
- * @example
- * // There is no constructor for this class, the user just has to define an
- * // object with the appropriate properties.
- */
-
-/**
- * The id of the dialog button. Required.
- * @name CKEDITOR.dialog.buttonDefinition.prototype.id
- * @type String
- * @field
- * @example
- */
-
-/**
- * The label of the dialog button. Required.
- * @name CKEDITOR.dialog.buttonDefinition.prototype.label
- * @type String
- * @field
- * @example
- */
-
-/**
- * The popup message of the dialog button.
- * @name CKEDITOR.dialog.buttonDefinition.prototype.title
- * @type String
- * @field
- * @example
- */
-
-/**
- * The CTRL hotkey for the button.
- * @name CKEDITOR.dialog.buttonDefinition.prototype.accessKey
- * @type String
- * @field
- * @example
- * exitButton.accessKey = 'X'; // Button will be pressed when user presses CTRL-X
+ * The definition of user interface element (textarea, radio etc).
+ *
This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create dialog UI elements.
+ * @name CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @see CKEDITOR.ui.dialog.uiElement
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ */
+
+/**
+ * The id of the UI element.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.id
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * The type of the UI element. Required.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.type
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * The popup label of the UI element.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.title
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * CSS class names to append to the UI element.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.className
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * Inline CSS classes to append to the UI element.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.style
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * Function to execute the first time the UI element is displayed.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.onLoad
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * Function to execute whenever the UI element's parent dialog is displayed.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.onShow
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * Function to execute whenever the UI element's parent dialog is closed.
+ * @name CKEDITOR.dialog.definition.uiElement.prototype.onHide
+ * @field
+ * @type Function
+ * @example
+ */
+
+// ----- hbox -----
+
+/**
+ * Horizontal layout box for dialog UI elements, auto-expends to available width of container.
+ *
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create horizontal layouts.
+ *
Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.hbox} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ *
+ * @name CKEDITOR.dialog.definition.hbox
+ * @extends CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example:
+ * {
+ * type : 'hbox',
+ * widths : [ '25%', '25%', '50%' ],
+ * children :
+ * [
+ * {
+ * type : 'text',
+ * id : 'id1',
+ * width : '40px',
+ * },
+ * {
+ * type : 'text',
+ * id : 'id2',
+ * width : '40px',
+ * },
+ * {
+ * type : 'text',
+ * id : 'id3'
+ * }
+ * ]
+ * }
+ */
+
+/**
+ * Array of {@link CKEDITOR.ui.dialog.uiElement} objects inside this container.
+ * @name CKEDITOR.dialog.definition.hbox.prototype.children
+ * @field
+ * @type Array
+ * @example
+ */
+
+/**
+ * (Optional) The widths of child cells.
+ * @name CKEDITOR.dialog.definition.hbox.prototype.widths
+ * @field
+ * @type Array
+ * @example
+ */
+
+/**
+ * (Optional) The height of the layout.
+ * @name CKEDITOR.dialog.definition.hbox.prototype.height
+ * @field
+ * @type Number
+ * @example
+ */
+
+/**
+ * The CSS styles to apply to this element.
+ * @name CKEDITOR.dialog.definition.hbox.prototype.styles
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * (Optional) The padding width inside child cells. Example: 0, 1.
+ * @name CKEDITOR.dialog.definition.hbox.prototype.padding
+ * @field
+ * @type Number
+ * @example
+ */
+
+/**
+ * (Optional) The alignment of the whole layout. Example: center, top.
+ * @name CKEDITOR.dialog.definition.hbox.prototype.align
+ * @field
+ * @type String
+ * @example
+ */
+
+// ----- vbox -----
+
+/**
+ * Vertical layout box for dialog UI elements.
+ *
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create vertical layouts.
+ *
Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.vbox} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ *
+ *
+ * @name CKEDITOR.dialog.definition.vbox
+ * @extends CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example:
+ * {
+ * type : 'vbox',
+ * align : 'right',
+ * width : '200px',
+ * children :
+ * [
+ * {
+ * type : 'text',
+ * id : 'age',
+ * label : 'Age'
+ * },
+ * {
+ * type : 'text',
+ * id : 'sex',
+ * label : 'Sex'
+ * },
+ * {
+ * type : 'text',
+ * id : 'nationality',
+ * label : 'Nationality'
+ * }
+ * ]
+ * }
+ */
+
+/**
+ * Array of {@link CKEDITOR.ui.dialog.uiElement} objects inside this container.
+ * @name CKEDITOR.dialog.definition.vbox.prototype.children
+ * @field
+ * @type Array
+ * @example
+ */
+
+/**
+ * (Optional) The width of the layout.
+ * @name CKEDITOR.dialog.definition.vbox.prototype.width
+ * @field
+ * @type Array
+ * @example
+ */
+
+/**
+ * (Optional) The heights of individual cells.
+ * @name CKEDITOR.dialog.definition.vbox.prototype.heights
+ * @field
+ * @type Number
+ * @example
+ */
+
+/**
+ * The CSS styles to apply to this element.
+ * @name CKEDITOR.dialog.definition.vbox.prototype.styles
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * (Optional) The padding width inside child cells. Example: 0, 1.
+ * @name CKEDITOR.dialog.definition.vbox.prototype.padding
+ * @field
+ * @type Number
+ * @example
+ */
+
+/**
+ * (Optional) The alignment of the whole layout. Example: center, top.
+ * @name CKEDITOR.dialog.definition.vbox.prototype.align
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * (Optional) Whether the layout should expand vertically to fill its container.
+ * @name CKEDITOR.dialog.definition.vbox.prototype.expand
+ * @field
+ * @type Boolean
+ * @example
+ */
+
+// ----- button ------
+
+/**
+ * The definition of a button.
+ *
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create buttons.
+ *
Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.button} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ *
+ * For a complete example of dialog definition, please check {@link CKEDITOR.dialog.add}.
+ * @name CKEDITOR.dialog.definition.button
+ * @extends CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example:
+ * {
+ * type : 'button',
+ * id : 'buttonId',
+ * label : 'Click me',
+ * title : 'My title',
+ * onClick : function() {
+ * // this = CKEDITOR.ui.dialog.button
+ * alert( 'Clicked: ' + this.id );
+ * }
+ * }
*/
/**
* Whether the button is disabled.
- * @name CKEDITOR.dialog.buttonDefinition.prototype.disabled
+ * @name CKEDITOR.dialog.definition.button.prototype.disabled
* @type Boolean
* @field
+ * @example
+ */
+
+/**
+ * The label of the UI element.
+ * @name CKEDITOR.dialog.definition.button.prototype.label
+ * @type String
+ * @field
+ * @example
+ */
+
+// ----- checkbox ------
+
+/**
+ * The definition of a checkbox element.
+ *
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create groups of checkbox buttons.
+ *
Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.checkbox} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ *
+ * For a complete example of dialog definition, please check {@link CKEDITOR.dialog.add}.
+ * @name CKEDITOR.dialog.definition.checkbox
+ * @extends CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example:
+ * {
+ * type : 'checkbox',
+ * id : 'agree',
+ * label : 'I agree',
+ * 'default' : 'checked',
+ * onClick : function() {
+ * // this = CKEDITOR.ui.dialog.checkbox
+ * alert( 'Checked: ' + this.getValue() );
+ * }
+ * }
+ */
+
+/**
+ * (Optional) The validation function.
+ * @name CKEDITOR.dialog.definition.checkbox.prototype.validate
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * The label of the UI element.
+ * @name CKEDITOR.dialog.definition.checkbox.prototype.label
+ * @type String
+ * @field
+ * @example
+ */
+
+/**
+ * The default state.
+ * @name CKEDITOR.dialog.definition.checkbox.prototype.default
+ * @type String
+ * @field
+ * @default
+ * '' (unchecked)
+ * @example
+ */
+
+// ----- file -----
+
+/**
+ * The definition of a file upload input.
+ *
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create file upload elements.
+ *
Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.file} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ *
+ * For a complete example of dialog definition, please check {@link CKEDITOR.dialog.add}.
+ * @name CKEDITOR.dialog.definition.file
+ * @extends CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example:
+ * {
+ * type : 'file',
+ * id : 'upload',
+ * label : 'Select file from your computer',
+ * size : 38
+ * },
+ * {
+ * type : 'fileButton',
+ * id : 'fileId',
+ * label : 'Upload file',
+ * 'for' : [ 'tab1', 'upload' ]
+ * filebrowser : {
+ * onSelect : function( fileUrl, data ) {
+ * alert( 'Successfully uploaded: ' + fileUrl );
+ * }
+ * }
+ * }
+ */
+
+/**
+ * (Optional) The validation function.
+ * @name CKEDITOR.dialog.definition.file.prototype.validate
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * The label of the UI element.
+ * @name CKEDITOR.dialog.definition.file.prototype.label
+ * @type String
+ * @field
+ * @example
+ */
+
+/**
+ * (Optional) The action attribute of the form element associated with this file upload input.
+ * If empty, CKEditor will use path to server connector for currently opened folder.
+ * @name CKEDITOR.dialog.definition.file.prototype.action
+ * @type String
+ * @field
+ * @example
+ */
+
+/**
+ * The size of the UI element.
+ * @name CKEDITOR.dialog.definition.file.prototype.size
+ * @type Number
+ * @field
+ * @example
+ */
+
+// ----- fileButton -----
+
+/**
+ * The definition of a button for submitting the file in a file upload input.
+ *
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create a button for submitting the file in a file upload input.
+ *
Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.fileButton} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ *
+ * For a complete example of dialog definition, please check {@link CKEDITOR.dialog.add}.
+ * @name CKEDITOR.dialog.definition.fileButton
+ * @extends CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example:
+ * {
+ * type : 'file',
+ * id : 'upload',
+ * label : 'Select file from your computer',
+ * size : 38
+ * },
+ * {
+ * type : 'fileButton',
+ * id : 'fileId',
+ * label : 'Upload file',
+ * 'for' : [ 'tab1', 'upload' ]
+ * filebrowser : {
+ * onSelect : function( fileUrl, data ) {
+ * alert( 'Successfully uploaded: ' + fileUrl );
+ * }
+ * }
+ * }
+ */
+
+/**
+ * (Optional) The validation function.
+ * @name CKEDITOR.dialog.definition.fileButton.prototype.validate
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * The label of the UI element.
+ * @name CKEDITOR.dialog.definition.fileButton.prototype.label
+ * @type String
+ * @field
+ * @example
+ */
+
+/**
+ * The instruction for CKEditor how to deal with file upload.
+ * By default, the file and fileButton elements will not work "as expected" if this attribute is not set.
+ * @name CKEDITOR.dialog.definition.fileButton.prototype.filebrowser
+ * @type String|Object
+ * @field
+ * @example
+ * // Update field with id 'txtUrl' in the 'tab1' tab when file is uploaded.
+ * filebrowser : 'tab1:txtUrl'
+ *
+ * // Call custom onSelect function when file is successfully uploaded.
+ * filebrowser : {
+ * onSelect : function( fileUrl, data ) {
+ * alert( 'Successfully uploaded: ' + fileUrl );
+ * }
+ * }
+ */
+
+/**
+ * An array that contains pageId and elementId of the file upload input element for which this button is created.
+ * @name CKEDITOR.dialog.definition.fileButton.prototype.for
+ * @type String
+ * @field
+ * @example
+ * [ pageId, elementId ]
+ */
+
+// ----- html -----
+
+/**
+ * The definition of a raw HTML element.
+ *
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create elements made from raw HTML code.
+ *
Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.html} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ *
+ * For a complete example of dialog definition, please check {@link CKEDITOR.dialog.add}.
+ * To access HTML elements use {@link CKEDITOR.dom.document#getById}
+ * @name CKEDITOR.dialog.definition.html
+ * @extends CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example 1:
+ * {
+ * type : 'html',
+ * html : '<h3>This is some sample HTML content.</h3>'
+ * }
+ * @example
+ * // Example 2:
+ * // Complete sample with document.getById() call when the "Ok" button is clicked.
+ * var dialogDefinition =
+ * {
+ * title : 'Sample dialog',
+ * minWidth : 300,
+ * minHeight : 200,
+ * onOk : function() {
+ * // "this" is now a CKEDITOR.dialog object.
+ * var document = this.getElement().getDocument();
+ * // document = CKEDITOR.dom.document
+ * var element = document.getById( 'myDiv' );
+ * if ( element )
+ * alert( element.getHtml() );
+ * },
+ * contents : [
+ * {
+ * id : 'tab1',
+ * label : '',
+ * title : '',
+ * elements :
+ * [
+ * {
+ * type : 'html',
+ * html : '<div id="myDiv">Sample <b>text</b>.</div><div id="otherId">Another div.</div>'
+ * },
+ * ]
+ * }
+ * ],
+ * buttons : [ CKEDITOR.dialog.cancelButton, CKEDITOR.dialog.okButton ]
+ * };
+ */
+
+/**
+ * (Required) HTML code of this element.
+ * @name CKEDITOR.dialog.definition.html.prototype.html
+ * @type String
+ * @field
+ * @example
+ */
+
+// ----- radio ------
+
+/**
+ * The definition of a radio group.
+ *
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create groups of radio buttons.
+ *
Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.radio} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ *
+ * For a complete example of dialog definition, please check {@link CKEDITOR.dialog.add}.
+ * @name CKEDITOR.dialog.definition.radio
+ * @extends CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example:
+ * {
+ * type : 'radio',
+ * id : 'country',
+ * label : 'Which country is bigger',
+ * items : [ [ 'France', 'FR' ], [ 'Germany', 'DE' ] ] ,
+ * style : 'color:green',
+ * 'default' : 'DE',
+ * onClick : function() {
+ * // this = CKEDITOR.ui.dialog.radio
+ * alert( 'Current value: ' + this.getValue() );
+ * }
+ * }
+ */
+
+/**
+ * The default value.
+ * @name CKEDITOR.dialog.definition.radio.prototype.default
+ * @type String
+ * @field
+ * @example
+ */
+
+/**
+ * (Optional) The validation function.
+ * @name CKEDITOR.dialog.definition.radio.prototype.validate
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * An array of options. Each option is a 1- or 2-item array of format [ 'Description', 'Value' ]. If 'Value' is missing, then the value would be assumed to be the same as the description.
+ * @name CKEDITOR.dialog.definition.radio.prototype.items
+ * @field
+ * @type Array
+ * @example
+ */
+
+/**
+ * The label of the UI element.
+ * @name CKEDITOR.dialog.definition.radio.prototype.label
+ * @type String
+ * @field
+ * @example
+ */
+
+// ----- selectElement ------
+
+/**
+ * The definition of a select element.
+ *
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create select elements.
+ *
Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.select} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ *
+ * For a complete example of dialog definition, please check {@link CKEDITOR.dialog.add}.
+ * @name CKEDITOR.dialog.definition.select
+ * @extends CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example:
+ * {
+ * type : 'select',
+ * id : 'sport',
+ * label : 'Select your favourite sport',
+ * items : [ [ 'Basketball' ], [ 'Baseball' ], [ 'Hockey' ], [ 'Football' ] ],
+ * 'default' : 'Football',
+ * onChange : function( api ) {
+ * // this = CKEDITOR.ui.dialog.select
+ * alert( 'Current value: ' + this.getValue() );
+ * }
+ * }
+ */
+
+/**
+ * The default value.
+ * @name CKEDITOR.dialog.definition.select.prototype.default
+ * @type String
+ * @field
+ * @example
+ */
+
+/**
+ * (Optional) The validation function.
+ * @name CKEDITOR.dialog.definition.select.prototype.validate
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * An array of options. Each option is a 1- or 2-item array of format [ 'Description', 'Value' ]. If 'Value' is missing, then the value would be assumed to be the same as the description.
+ * @name CKEDITOR.dialog.definition.select.prototype.items
+ * @field
+ * @type Array
+ * @example
+ */
+
+/**
+ * (Optional) Set this to true if you'd like to have a multiple-choice select box.
+ * @name CKEDITOR.dialog.definition.select.prototype.multiple
+ * @type Boolean
+ * @field
+ * @example
* @default false
- * @example
- */
-
-/**
- * The function to execute when the button is clicked.
- * @name CKEDITOR.dialog.buttonDefinition.prototype.onClick
- * @type Function
- * @field
- * @example
- */
-
-/**
- * This class is not really part of the API. It just illustrates the properties
- * that developers can use to define and create dialog UI elements.
- * @name CKEDITOR.dialog.uiElementDefinition
- * @constructor
- * @see CKEDITOR.ui.dialog.uiElement
- * @example
- * // There is no constructor for this class, the user just has to define an
- * // object with the appropriate properties.
- */
-
-/**
- * The id of the UI element.
- * @name CKEDITOR.dialog.uiElementDefinition.prototype.id
- * @field
- * @type String
- * @example
- */
-
-/**
- * The type of the UI element. Required.
- * @name CKEDITOR.dialog.uiElementDefinition.prototype.type
- * @field
- * @type String
- * @example
- */
-
-/**
- * The popup label of the UI element.
- * @name CKEDITOR.dialog.uiElementDefinition.prototype.title
- * @field
- * @type String
- * @example
- */
-
-/**
- * CSS class names to append to the UI element.
- * @name CKEDITOR.dialog.uiElementDefinition.prototype.className
- * @field
- * @type String
- * @example
- */
-
-/**
- * Inline CSS classes to append to the UI element.
- * @name CKEDITOR.dialog.uiElementDefinition.prototype.style
- * @field
- * @type String
- * @example
- */
-
-/**
- * Function to execute the first time the UI element is displayed.
- * @name CKEDITOR.dialog.uiElementDefinition.prototype.onLoad
- * @field
- * @type Function
- * @example
- */
-
-/**
- * Function to execute whenever the UI element's parent dialog is displayed.
- * @name CKEDITOR.dialog.uiElementDefinition.prototype.onShow
- * @field
- * @type Function
- * @example
- */
-
-/**
- * Function to execute whenever the UI element's parent dialog is closed.
- * @name CKEDITOR.dialog.uiElementDefinition.prototype.onHide
- * @field
- * @type Function
- * @example
- */
+ */
+
+/**
+ * (Optional) The number of items to display in the select box.
+ * @name CKEDITOR.dialog.definition.select.prototype.size
+ * @type Number
+ * @field
+ * @example
+ */
+
+/**
+ * The label of the UI element.
+ * @name CKEDITOR.dialog.definition.select.prototype.label
+ * @type String
+ * @field
+ * @example
+ */
+
+// ----- textInput -----
+
+/**
+ * The definition of a text field (single line).
+ *
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create text fields.
+ *
Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.textInput} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ *
+ * For a complete example of dialog definition, please check {@link CKEDITOR.dialog.add}.
+ * @name CKEDITOR.dialog.definition.textInput
+ * @extends CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * {
+ * type : 'text',
+ * id : 'name',
+ * label : 'Your name',
+ * 'default' : '',
+ * validate : function() {
+ * if ( !this.getValue() )
+ * {
+ * api.openMsgDialog( '', 'Name cannot be empty.' );
+ * return false;
+ * }
+ * }
+ * }
+ */
+
+/**
+ * The default value.
+ * @name CKEDITOR.dialog.definition.textInput.prototype.default
+ * @type String
+ * @field
+ * @example
+ */
+
+/**
+ * (Optional) The maximum length.
+ * @name CKEDITOR.dialog.definition.textInput.prototype.maxLength
+ * @type Number
+ * @field
+ * @example
+ */
+
+/**
+ * (Optional) The size of the input field.
+ * @name CKEDITOR.dialog.definition.textInput.prototype.size
+ * @type Number
+ * @field
+ * @example
+ */
+
+/**
+ * (Optional) The validation function.
+ * @name CKEDITOR.dialog.definition.textInput.prototype.validate
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * The label of the UI element.
+ * @name CKEDITOR.dialog.definition.textInput.prototype.label
+ * @type String
+ * @field
+ * @example
+ */
+
+// ----- textarea ------
+
+/**
+ * The definition of a text field (multiple lines).
+ *
+ * This class is not really part of the API. It just illustrates the properties
+ * that developers can use to define and create textarea.
+ *
Once the dialog is opened, the created element becomes a {@link CKEDITOR.ui.dialog.textarea} object and can be accessed with {@link CKEDITOR.dialog#getContentElement}.
+ *
+ * For a complete example of dialog definition, please check {@link CKEDITOR.dialog.add}.
+ * @name CKEDITOR.dialog.definition.textarea
+ * @extends CKEDITOR.dialog.definition.uiElement
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * // Example:
+ * {
+ * type : 'textarea',
+ * id : 'message',
+ * label : 'Your comment',
+ * 'default' : '',
+ * validate : function() {
+ * if ( this.getValue().length < 5 )
+ * {
+ * api.openMsgDialog( 'The comment is too short.' );
+ * return false;
+ * }
+ * }
+ * }
+ */
+
+/**
+ * The number of rows.
+ * @name CKEDITOR.dialog.definition.textarea.prototype.rows
+ * @type Number
+ * @field
+ * @example
+ */
+
+/**
+ * The number of columns.
+ * @name CKEDITOR.dialog.definition.textarea.prototype.cols
+ * @type Number
+ * @field
+ * @example
+ */
+
+/**
+ * (Optional) The validation function.
+ * @name CKEDITOR.dialog.definition.textarea.prototype.validate
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * The default value.
+ * @name CKEDITOR.dialog.definition.textarea.prototype.default
+ * @type String
+ * @field
+ * @example
+ */
+
+/**
+ * The label of the UI element.
+ * @name CKEDITOR.dialog.definition.textarea.prototype.label
+ * @type String
+ * @field
+ * @example
+ */
Index: /CKEditor/branches/versions/3.5.x/_source/plugins/dialog/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/plugins/dialog/plugin.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/plugins/dialog/plugin.js (revision 6655)
@@ -168,11 +168,13 @@
// Set the startup styles for the dialog, avoiding it enlarging the
// page size on the dialog creation.
- this.parts.dialog.setStyles(
- {
+ var startStyles = {
position : CKEDITOR.env.ie6Compat ? 'absolute' : 'fixed',
top : 0,
- left: 0,
visibility : 'hidden'
- });
+ };
+
+ startStyles[ dir == 'rtl' ? 'right' : 'left' ] = 0;
+ this.parts.dialog.setStyles( startStyles );
+
// Call the CKEDITOR.event constructor to initialize this instance.
@@ -636,4 +638,16 @@
}, this._.editor );
+ this.fire( 'resize',
+ {
+ skin : this._.editor.skinName,
+ width : width,
+ height : height
+ }, this._.editor );
+
+ // Update dialog position when dimension get changed in RTL.
+ if ( this._.editor.lang.dir == 'rtl' && this._.position )
+ this._.position.x = CKEDITOR.document.getWindow().getViewPaneSize().width -
+ this._.contentSize.width - parseInt( this._.element.getFirst().getStyle( 'right' ), 10 );
+
this._.contentSize = { width : width, height : height };
};
@@ -668,5 +682,7 @@
// The dialog may be fixed positioned or absolute positioned. Ask the
// browser what is the current situation first.
- var element = this._.element.getFirst();
+ var element = this._.element.getFirst(),
+ rtl = this._.editor.lang.dir == 'rtl';
+
if ( isFixed === undefined )
isFixed = element.getComputedStyle( 'position' ) == 'fixed';
@@ -686,9 +702,16 @@
}
- element.setStyles(
- {
- 'left' : ( x > 0 ? x : 0 ) + 'px',
- 'top' : ( y > 0 ? y : 0 ) + 'px'
- });
+ // Translate coordinate for RTL.
+ if ( rtl )
+ {
+ var dialogSize = this.getSize(),
+ viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize();
+ x = viewPaneSize.width - dialogSize.width - x;
+ }
+
+ var styles = { 'top' : ( y > 0 ? y : 0 ) + 'px' };
+ styles[ rtl ? 'right' : 'left' ] = ( x > 0 ? x : 0 ) + 'px';
+
+ element.setStyles( styles );
save && ( this._.moved = 1 );
@@ -732,6 +755,6 @@
// First, set the dialog to an appropriate size.
- this.resize( this._.contentSize && this._.contentSize.width || definition.minWidth,
- this._.contentSize && this._.contentSize.height || definition.minHeight );
+ this.resize( this._.contentSize && this._.contentSize.width || definition.width || definition.minWidth,
+ this._.contentSize && this._.contentSize.height || definition.height || definition.minHeight );
// Reset all inputs back to their default value.
@@ -936,5 +959,5 @@
expand : !!contents.expand,
padding : contents.padding,
- style : contents.style || 'width: 100%;'
+ style : contents.style || 'width: 100%;height:100%'
}, pageHtml );
@@ -1250,7 +1273,75 @@
* A function returning the dialog's definition, or the URL to the .js file holding the function.
* The function should accept an argument "editor" which is the current editor instance, and
- * return an object conforming to {@link CKEDITOR.dialog.dialogDefinition}.
+ * return an object conforming to {@link CKEDITOR.dialog.definition}.
+ * @see CKEDITOR.dialog.definition
* @example
- * @see CKEDITOR.dialog.dialogDefinition
+ * // Full sample plugin, which does not only register a dialog window but also adds an item to the context menu.
+ * // To open the dialog window, choose "Open dialog" in the context menu.
+ * CKEDITOR.plugins.add( 'myplugin',
+ * {
+ * init: function( editor )
+ * {
+ * editor.addCommand( 'mydialog',new CKEDITOR.dialogCommand( 'mydialog' ) );
+ *
+ * if ( editor.contextMenu )
+ * {
+ * editor.addMenuGroup( 'mygroup', 10 );
+ * editor.addMenuItem( 'My Dialog',
+ * {
+ * label : 'Open dialog',
+ * command : 'mydialog',
+ * group : 'mygroup'
+ * });
+ * editor.contextMenu.addListener( function( element )
+ * {
+ * return { 'My Dialog' : CKEDITOR.TRISTATE_OFF };
+ * });
+ * }
+ *
+ * CKEDITOR.dialog.add( 'mydialog', function( api )
+ * {
+ * // CKEDITOR.dialog.definition
+ * var dialogDefinition =
+ * {
+ * title : 'Sample dialog',
+ * minWidth : 390,
+ * minHeight : 130,
+ * contents : [
+ * {
+ * id : 'tab1',
+ * label : 'Label',
+ * title : 'Title',
+ * expand : true,
+ * padding : 0,
+ * elements :
+ * [
+ * {
+ * type : 'html',
+ * html : '<p>This is some sample HTML content.</p>'
+ * },
+ * {
+ * type : 'textarea',
+ * id : 'textareaId',
+ * rows : 4,
+ * cols : 40
+ * }
+ * ]
+ * }
+ * ],
+ * buttons : [ CKEDITOR.dialog.okButton, CKEDITOR.dialog.cancelButton ],
+ * onOk : function() {
+ * // "this" is now a CKEDITOR.dialog object.
+ * // Accessing dialog elements:
+ * var textareaObj = this.getContentElement( 'tab1', 'textareaId' );
+ * alert( "You have entered: " + textareaObj.getValue() );
+ * }
+ * };
+ *
+ * return dialogDefinition;
+ * } );
+ * }
+ * } );
+ *
+ * CKEDITOR.replace( 'editor1', { extraPlugins : 'myplugin' } );
*/
add : function( name, dialogDefinition )
@@ -1443,6 +1534,6 @@
* passed to "dialogDefinition" event handlers.
* @constructor
- * @name CKEDITOR.dialog.dialogDefinitionObject
- * @extends CKEDITOR.dialog.dialogDefinition
+ * @name CKEDITOR.dialog.definitionObject
+ * @extends CKEDITOR.dialog.definition
* @example
* CKEDITOR.on( 'dialogDefinition', function( evt )
@@ -1467,10 +1558,10 @@
definitionObject.prototype =
- /** @lends CKEDITOR.dialog.dialogDefinitionObject.prototype */
+ /** @lends CKEDITOR.dialog.definitionObject.prototype */
{
/**
* Gets a content definition.
* @param {String} id The id of the content definition.
- * @returns {CKEDITOR.dialog.contentDefinition} The content definition
+ * @returns {CKEDITOR.dialog.definition.content} The content definition
* matching id.
*/
@@ -1483,5 +1574,5 @@
* Gets a button definition.
* @param {String} id The id of the button definition.
- * @returns {CKEDITOR.dialog.buttonDefinition} The button definition
+ * @returns {CKEDITOR.dialog.definition.button} The button definition
* matching id.
*/
@@ -1493,5 +1584,5 @@
/**
* Adds a content definition object under this dialog definition.
- * @param {CKEDITOR.dialog.contentDefinition} contentDefinition The
+ * @param {CKEDITOR.dialog.definition.content} contentDefinition The
* content definition.
* @param {String} [nextSiblingId] The id of an existing content
@@ -1499,5 +1590,5 @@
* before. Omit if the new content definition is to be inserted as
* the last item.
- * @returns {CKEDITOR.dialog.contentDefinition} The inserted content
+ * @returns {CKEDITOR.dialog.definition.content} The inserted content
* definition.
*/
@@ -1509,5 +1600,5 @@
/**
* Adds a button definition object under this dialog definition.
- * @param {CKEDITOR.dialog.buttonDefinition} buttonDefinition The
+ * @param {CKEDITOR.dialog.definition.button} buttonDefinition The
* button definition.
* @param {String} [nextSiblingId] The id of an existing button
@@ -1515,5 +1606,5 @@
* before. Omit if the new button definition is to be inserted as
* the last item.
- * @returns {CKEDITOR.dialog.buttonDefinition} The inserted button
+ * @returns {CKEDITOR.dialog.definition.button} The inserted button
* definition.
*/
@@ -1526,5 +1617,5 @@
* Removes a content definition from this dialog definition.
* @param {String} id The id of the content definition to be removed.
- * @returns {CKEDITOR.dialog.contentDefinition} The removed content
+ * @returns {CKEDITOR.dialog.definition.content} The removed content
* definition.
*/
@@ -1537,5 +1628,5 @@
* Removes a button definition from the dialog definition.
* @param {String} id The id of the button definition to be removed.
- * @returns {CKEDITOR.dialog.buttonDefinition} The removed button
+ * @returns {CKEDITOR.dialog.definition.button} The removed button
* definition.
*/
@@ -1549,7 +1640,7 @@
* This class is not really part of the API. It is the template of the
* objects representing content pages inside the
- * CKEDITOR.dialog.dialogDefinitionObject.
+ * CKEDITOR.dialog.definitionObject.
* @constructor
- * @name CKEDITOR.dialog.contentDefinitionObject
+ * @name CKEDITOR.dialog.definition.contentObject
* @example
* CKEDITOR.on( 'dialogDefinition', function( evt )
@@ -1572,10 +1663,10 @@
contentObject.prototype =
- /** @lends CKEDITOR.dialog.contentDefinitionObject.prototype */
+ /** @lends CKEDITOR.dialog.definition.contentObject.prototype */
{
/**
* Gets a UI element definition under the content definition.
* @param {String} id The id of the UI element definition.
- * @returns {CKEDITOR.dialog.uiElementDefinition}
+ * @returns {CKEDITOR.dialog.definition.uiElement}
*/
get : function( id )
@@ -1586,5 +1677,5 @@
/**
* Adds a UI element definition to the content definition.
- * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition The
+ * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition The
* UI elemnet definition to be added.
* @param {String} nextSiblingId The id of an existing UI element
@@ -1592,5 +1683,5 @@
* before. Omit if the new button definition is to be inserted as
* the last item.
- * @returns {CKEDITOR.dialog.uiElementDefinition} The element
+ * @returns {CKEDITOR.dialog.definition.uiElement} The element
* definition inserted.
*/
@@ -1604,5 +1695,5 @@
* @param {String} id The id of the UI element definition to be
* removed.
- * @returns {CKEDITOR.dialog.uiElementDefinition} The element
+ * @returns {CKEDITOR.dialog.definition.uiElement} The element
* definition removed.
* @example
@@ -1704,17 +1795,4 @@
dialogCover;
- function positionDialog( right )
- {
- // Maintain righthand sizing in RTL.
- if ( dialog._.moved && editor.lang.dir == 'rtl' )
- {
- var element = dialog._.element.getFirst();
- element.setStyle( 'right', right + "px" );
- element.removeStyle( 'left' );
- }
- else if ( !dialog._.moved )
- dialog.layout();
- }
-
var mouseDownFn = CKEDITOR.tools.addFunction( function( $event )
{
@@ -1760,5 +1838,6 @@
else if ( resizable == CKEDITOR.DIALOG_RESIZE_HEIGHT )
direction = ' cke_resizer_vertical';
- var resizer = CKEDITOR.dom.element.createFromHtml( '' );
@@ -1780,8 +1859,4 @@
position = dialog.getPosition();
- // IE might return "auto", we need exact position.
- if ( right )
- right = right == 'auto' ? viewSize.width - ( position.x || 0 ) - element.getSize( 'width' ) : parseInt( right, 10 );
-
if ( position.y + internalHeight > viewSize.height )
internalHeight = viewSize.height - position.y;
@@ -1791,5 +1866,5 @@
// Make sure the dialog will not be resized to the wrong side when it's in the leftmost position for RTL.
- if ( ( resizable == CKEDITOR.DIALOG_RESIZE_WIDTH || resizable == CKEDITOR.DIALOG_RESIZE_BOTH ) && !( rtl && dx > 0 && !position.x ) )
+ if ( ( resizable == CKEDITOR.DIALOG_RESIZE_WIDTH || resizable == CKEDITOR.DIALOG_RESIZE_BOTH ) )
width = Math.max( def.minWidth || 0, internalWidth - wrapperWidth );
@@ -1798,6 +1873,7 @@
dialog.resize( width, height );
- // The right property might get broken during resizing, so computing it before the resizing.
- positionDialog( right );
+
+ if ( !dialog._.moved )
+ dialog.layout();
evt.data.preventDefault();
@@ -1820,22 +1896,4 @@
coverDoc.removeListener( 'mouseup', mouseUpHandler );
coverDoc.removeListener( 'mousemove', mouseMoveHandler );
- }
-
- // Switch back to use the left property, if RTL is used.
- if ( editor.lang.dir == 'rtl' )
- {
- var element = dialog._.element.getFirst(),
- left = element.getComputedStyle( 'left' );
-
- // IE might return "auto", we need exact position.
- if ( left == 'auto' )
- left = viewSize.width - parseInt( element.getStyle( 'right' ), 10 ) - dialog.getSize().width;
- else
- left = parseInt( left, 10 );
-
- element.removeStyle( 'right' );
- // Make sure the left property gets applied, even if it is the same as previously.
- dialog._.position.x += 1;
- dialog.move( left, dialog._.position.y );
}
}
@@ -2087,5 +2145,5 @@
* @constructor
* @param {CKEDITOR.dialog} dialog Parent dialog object.
- * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition Element
+ * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition Element
* definition. Accepted fields:
*
@@ -2252,5 +2310,5 @@
* @param {Array} htmlList
* Array of HTML code that this element will output to.
- * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition
+ * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition
* The element definition. Accepted fields:
*
@@ -2336,5 +2394,5 @@
* @param {Array} htmlList
* Array of HTML code that this element will output to.
- * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition
+ * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition
* The element definition. Accepted fields:
*
@@ -2533,5 +2591,5 @@
* This function is only called at UI element instantiation, but can
* be overridded in child classes if they require more flexibility.
- * @param {CKEDITOR.dialog.uiElementDefinition} definition The UI element
+ * @param {CKEDITOR.dialog.definition.uiElement} definition The UI element
* definition.
* @returns {CKEDITOR.dialog.uiElement} The current UI element.
@@ -2958,5 +3016,8 @@
}
else if ( dialogDefinitions == 'failed' )
+ {
+ hideCover();
throw new Error( '[CKEDITOR.dialog.openDialog] Dialog "' + dialogName + '" failed when loading definition.' );
+ }
var me = this;
@@ -3074,5 +3135,5 @@
* @name CKEDITOR#dialogDefinition
* @event
- * @param {CKEDITOR.dialog.dialogDefinition} data The dialog defination that
+ * @param {CKEDITOR.dialog.definition} data The dialog defination that
* is being loaded.
* @param {CKEDITOR.editor} editor The editor instance that will use the
@@ -3128,9 +3189,11 @@
/**
* Fired when a dialog is being resized. The event is fired on
- * the 'CKEDITOR.dialog' object, not a dialog instance.
+ * both the 'CKEDITOR.dialog' object and the dialog instance
+ * since 3.5.3, previously it's available only in the global object.
* @name CKEDITOR.dialog#resize
* @since 3.5
* @event
- * @param {CKEDITOR.dialog} dialog The dialog being resized.
+ * @param {CKEDITOR.dialog} dialog The dialog being resized (if
+ * it's fired on the dialog itself, this parameter isn't sent).
* @param {String} skin The skin name.
* @param {Number} width The new width.
Index: /CKEditor/branches/versions/3.5.x/_source/plugins/dialogadvtab/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/plugins/dialogadvtab/plugin.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/plugins/dialogadvtab/plugin.js (revision 6655)
@@ -36,12 +36,4 @@
var attrName = this.att,
value = this.getValue();
-
- // Broadcast Lang Dir change
- if ( attrName == 'dir' )
- {
- var dir = element.getAttribute( attrName );
- if ( dir != value && element.getParent() )
- this._.dialog._.editor.fire( 'dirChanged', { node : element, dir : value || element.getDirection( 1 ) } );
- }
if ( value )
Index: /CKEditor/branches/versions/3.5.x/_source/plugins/dialogui/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/plugins/dialogui/plugin.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/plugins/dialogui/plugin.js (revision 6655)
@@ -125,5 +125,5 @@
* @param {CKEDITOR.dialog} dialog
* Parent dialog object.
- * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition
+ * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition
* The element definition. Accepted fields:
*
@@ -838,5 +838,5 @@
* @param {Array} htmlList
* Array of HTML code that this element will output to.
- * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition
+ * @param {CKEDITOR.dialog.definition.uiElement} elementDefinition
* The element definition. Accepted fields:
*
Index: /CKEditor/branches/versions/3.5.x/_source/plugins/domiterator/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/plugins/domiterator/plugin.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/plugins/domiterator/plugin.js (revision 6655)
@@ -32,5 +32,7 @@
var beginWhitespaceRegex = /^[\r\n\t ]+$/,
// Ignore bookmark nodes.(#3783)
- bookmarkGuard = CKEDITOR.dom.walker.bookmark( false, true );
+ bookmarkGuard = CKEDITOR.dom.walker.bookmark( false, true ),
+ whitespacesGuard = CKEDITOR.dom.walker.whitespaces( true ),
+ skipGuard = function( node ) { return bookmarkGuard( node ) && whitespacesGuard( node ); };
// Get a reference for the next element, bookmark nodes are skipped.
@@ -208,5 +210,5 @@
if ( range && !closeRange )
{
- while ( !currentNode.getNext( bookmarkGuard ) && !isLast )
+ while ( !currentNode.getNext( skipGuard ) && !isLast )
{
var parentNode = currentNode.getParent();
@@ -216,5 +218,8 @@
{
closeRange = 1;
+ includeNode = 0;
isLast = isLast || ( parentNode.equals( lastNode) );
+ // Make sure range includes bookmarks at the end of the block. (#7359)
+ range.setEndAt( parentNode, CKEDITOR.POSITION_BEFORE_END );
break;
}
Index: /CKEditor/branches/versions/3.5.x/_source/plugins/editingblock/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/plugins/editingblock/plugin.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/plugins/editingblock/plugin.js (revision 6655)
@@ -154,4 +154,6 @@
CKEDITOR.editor.prototype.setMode = function( mode )
{
+ this.fire( 'beforeSetMode', { newMode : mode } );
+
var data,
holderElement = this.getThemeSpace( 'contents' ),
@@ -196,4 +198,5 @@
CKEDITOR.editor.prototype.focus = function()
{
+ this.forceNextSelectionCheck();
var mode = getMode( this );
if ( mode )
@@ -214,4 +217,5 @@
/**
* Sets whether the editor should have the focus when the page loads.
+ * @name CKEDITOR.config.startupFocus
* @type Boolean
* @default false
@@ -243,6 +247,14 @@
/**
- * Fired before changing the editing mode
+ * Fired before changing the editing mode.
* @name CKEDITOR.editor#beforeModeUnload
* @event
*/
+
+ /**
+ * Fired before the editor mode is set.
+ * @name CKEDITOR.editor#beforeSetMode
+ * @event
+ * @since 3.5.3
+ * @param {String} newMode The name of the mode which is about to be set.
+ */
Index: /CKEditor/branches/versions/3.5.x/_source/plugins/elementspath/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/plugins/elementspath/plugin.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/plugins/elementspath/plugin.js (revision 6655)
@@ -15,4 +15,5 @@
toolbarFocus :
{
+ editorFocus : false,
exec : function( editor )
{
Index: /CKEditor/branches/versions/3.5.x/_source/plugins/enterkey/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/plugins/enterkey/plugin.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/plugins/enterkey/plugin.js (revision 6655)
@@ -76,5 +76,6 @@
{
previousBlock.breakParent( node );
- range.moveToElementEditStart( previousBlock.getNext() );
+ node = previousBlock.getNext();
+ range.moveToElementEditStart( node );
previousBlock.move( previousBlock.getPrevious() );
}
@@ -111,4 +112,6 @@
// Otherwise, duplicate the previous block.
newBlock = previousBlock.clone();
+ // Value attribute of list item should not be duplicated (#7330).
+ newBlock.is( 'li' ) && newBlock.removeAttribute( 'value' );
}
}
@@ -118,7 +121,13 @@
if ( !newBlock )
{
- newBlock = doc.createElement( blockTag );
- if ( previousBlock && ( newBlockDir = previousBlock.getDirection() ) )
- newBlock.setAttribute( 'dir', newBlockDir );
+ // We have already created a new list item. (#6849)
+ if ( node && node.is( 'li' ) )
+ newBlock = node;
+ else
+ {
+ newBlock = doc.createElement( blockTag );
+ if ( previousBlock && ( newBlockDir = previousBlock.getDirection() ) )
+ newBlock.setAttribute( 'dir', newBlockDir );
+ }
}
// Force the enter block unless we're talking of a list item.
@@ -151,5 +160,6 @@
newBlock.appendBogus();
- range.insertNode( newBlock );
+ if ( !newBlock.getParent() )
+ range.insertNode( newBlock );
// This is tricky, but to make the new block visible correctly
@@ -266,27 +276,25 @@
range.insertNode( lineBreak );
- // A text node is required by Gecko only to make the cursor blink.
- // We need some text inside of it, so the bogus is properly
- // created.
- if ( !CKEDITOR.env.ie )
- doc.createText( '\ufeff' ).insertAfter( lineBreak );
-
- // If we are at the end of a block, we must be sure the bogus node is available in that block.
- if ( isEndOfBlock && !CKEDITOR.env.ie )
- lineBreak.getParent().appendBogus();
-
- // Now we can remove the text node contents, so the caret doesn't
- // stop on it.
- if ( !CKEDITOR.env.ie )
- lineBreak.getNext().$.nodeValue = '';
// IE has different behavior regarding position.
if ( CKEDITOR.env.ie )
range.setStartAt( lineBreak, CKEDITOR.POSITION_AFTER_END );
else
+ {
+ // A text node is required by Gecko only to make the cursor blink.
+ // We need some text inside of it, so the bogus is properly
+ // created.
+ doc.createText( '\ufeff' ).insertAfter( lineBreak );
+
+ // If we are at the end of a block, we must be sure the bogus node is available in that block.
+ if ( isEndOfBlock )
+ lineBreak.getParent().appendBogus();
+
+ // Now we can remove the text node contents, so the caret doesn't
+ // stop on it.
+ lineBreak.getNext().$.nodeValue = '';
+
range.setStartAt( lineBreak.getNext(), CKEDITOR.POSITION_AFTER_START );
- // Scroll into view, for non IE.
- if ( !CKEDITOR.env.ie )
- {
+ // Scroll into view, for non IE.
var dummy = null;
@@ -364,5 +372,4 @@
}
-
function getRange( editor )
{
Index: /CKEditor/branches/versions/3.5.x/_source/plugins/filebrowser/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/plugins/filebrowser/plugin.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/plugins/filebrowser/plugin.js (revision 6655)
@@ -113,5 +113,5 @@
( function()
{
- /**
+ /*
* Adds (additional) arguments to given url.
*
@@ -136,5 +136,5 @@
}
- /**
+ /*
* Make a string's first character uppercase.
*
@@ -149,5 +149,5 @@
}
- /**
+ /*
* The onlick function assigned to the 'Browse Server' button. Opens the
* file browser and updates target field when file is selected.
@@ -178,5 +178,5 @@
}
- /**
+ /*
* The onlick function assigned to the 'Upload' button. Makes the final
* decision whether form is really submitted and updates target field when
@@ -203,5 +203,5 @@
}
- /**
+ /*
* Setups the file element.
*
@@ -224,5 +224,5 @@
}
- /**
+ /*
* Traverse through the content definition and attach filebrowser to
* elements with 'filebrowser' attribute.
@@ -230,8 +230,8 @@
* @param String
* dialogName Dialog name.
- * @param {CKEDITOR.dialog.dialogDefinitionObject}
+ * @param {CKEDITOR.dialog.definitionObject}
* definition Dialog definition.
* @param {Array}
- * elements Array of {@link CKEDITOR.dialog.contentDefinition}
+ * elements Array of {@link CKEDITOR.dialog.definition.content}
* objects.
*/
@@ -309,5 +309,5 @@
}
- /**
+ /*
* Updates the target element with the url of uploaded/selected file.
*
@@ -334,8 +334,8 @@
}
- /**
+ /*
* Returns true if filebrowser is configured in one of the elements.
*
- * @param {CKEDITOR.dialog.dialogDefinitionObject}
+ * @param {CKEDITOR.dialog.definitionObject}
* definition Dialog definition.
* @param String
@@ -501,2 +501,24 @@
* config.filebrowserWindowFeatures = 'resizable=yes,scrollbars=no';
*/
+
+/**
+ * The width of the file browser popup window. It can be a number or a percent string.
+ * @name CKEDITOR.config.filebrowserWindowWidth
+ * @type Number|String
+ * @default '80%'
+ * @example
+ * config.filebrowserWindowWidth = 750;
+ * @example
+ * config.filebrowserWindowWidth = '50%';
+ */
+
+/**
+ * The height of the file browser popup window. It can be a number or a percent string.
+ * @name CKEDITOR.config.filebrowserWindowHeight
+ * @type Number|String
+ * @default '70%'
+ * @example
+ * config.filebrowserWindowHeight = 580;
+ * @example
+ * config.filebrowserWindowHeight = '50%';
+ */
Index: /CKEditor/branches/versions/3.5.x/_source/plugins/flash/dialogs/flash.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/plugins/flash/dialogs/flash.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/plugins/flash/dialogs/flash.js (revision 6655)
@@ -29,5 +29,5 @@
codebase : [ { type : ATTRTYPE_OBJECT, name : 'codebase'} ],
pluginspage : [ { type : ATTRTYPE_EMBED, name : 'pluginspage' } ],
- src : [ { type : ATTRTYPE_PARAM, name : 'movie' }, { type : ATTRTYPE_EMBED, name : 'src' } ],
+ src : [ { type : ATTRTYPE_PARAM, name : 'movie' }, { type : ATTRTYPE_EMBED, name : 'src' }, { type : ATTRTYPE_OBJECT, name : 'data' } ],
name : [ { type : ATTRTYPE_EMBED, name : 'name' } ],
align : [ { type : ATTRTYPE_OBJECT, name : 'align' } ],
Index: /CKEditor/branches/versions/3.5.x/_source/plugins/flash/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/plugins/flash/plugin.js (revision 6654)
+++ /CKEditor/branches/versions/3.5.x/_source/plugins/flash/plugin.js (revision 6655)
@@ -108,5 +108,5 @@
classId = attributes.classid && String( attributes.classid ).toLowerCase();
- if ( !classId )
+ if ( !classId && !isFlashEmbed( element ) )
{
// Look for the inner