Index: /CKEditor/trunk/_samples/api_dialog.html
===================================================================
--- /CKEditor/trunk/_samples/api_dialog.html	(revision 2997)
+++ /CKEditor/trunk/_samples/api_dialog.html	(revision 2997)
@@ -0,0 +1,153 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>Replace Textarea by Code - CKEditor Sample</title>
+	<script type="text/javascript" src="sample.js"></script>
+	<style id="styles" type="text/css">
+
+.cke_button_myDialogCmd .cke_icon
+{
+	display : none !important;
+}
+
+.cke_button_myDialogCmd .cke_label
+{
+	display : inline !important;
+}
+
+	</style>
+	<script id="headscript" type="text/javascript">
+	//<![CDATA[
+
+// When opening a dialog, its "definition" is created for it, for
+// each editor instance. The "dialogDefinition" event is then
+// fired. We should use this event to make customizations to the
+// definition of existing dialogs.
+CKEDITOR.on( 'dialogDefinition', function( ev )
+	{
+		// Take the dialog name and its definition from the event
+		// data.
+		var dialogName = ev.data.name;
+		var dialogDefinition = ev.data.definition;
+
+		// Check if the definition is from the dialog we're
+		// interested on (the "Link" dialog).
+		if ( dialogName == 'link' )
+		{
+			// Get a reference to the "Link Info" tab.
+			var infoTab = dialogDefinition.getContents( 'info' );
+
+			// Add a text field to the "info" tab.
+			infoTab.add( {
+					type : 'text',
+					label : 'My Custom Field',
+					id : 'customField',
+					'default' : 'Sample!',
+					validate : function()
+					{
+						if ( /\d/.test( this.getValue() ) )
+							return 'My Custom Field must not contain digits';
+					}
+				});
+
+			// Remove the "Link Type" combo and the "Browser
+			// Server" button from the "info" tab.
+			infoTab.remove( 'protocol' );
+			infoTab.remove( 'browse' );
+
+			// Set the default value for the URL field.
+			var urlField = infoTab.get( 'url' );
+			urlField['default'] = 'www.example.com';
+
+			// Remove the "Target" tab from the "Link" dialog.
+			dialogDefinition.removeContents( 'target' );
+
+			// Add a new tab to the "Link" dialog.
+			dialogDefinition.addContents({
+				id : 'customTab',
+				label : 'My Tab',
+				accessKey : 'M',
+				elements : [
+					{
+						id : 'myField1',
+						type : 'text',
+						label : 'My Text Field'
+					},
+					{
+						id : 'myField2',
+						type : 'text',
+						label : 'Another Text Field'
+					}
+				]
+			});
+		}
+	});
+	
+	//]]>
+	</script>
+</head>
+<body>
+	<div id="html">
+		<p>
+			This sample shows how to use the dialog API to customize dialogs whithout changing
+			the original editor code. The following customizations are being done::</p>
+		<ol>
+			<li><strong>Add dialog pages</strong> ("My Tab" in the Link dialog).</li>
+			<li><strong>Remove a dialog tab</strong> ("Target" tab from the Link dialog).</li>
+			<li><strong>Add dialog fields</strong> ("My Custom Field" into the Link dialog).</li>
+			<li><strong>Remove dialog fields</strong> ("Link Type" and "Browser Server" the Link dialog).</li>
+			<li><strong>Set default values for dialog fields</strong> (for the "URL" field in the
+				Link dialog). </li>
+			<li><strong>Create a custom dialog</strong> ("My Dialog" button).</li>
+		</ol>
+		<textarea id="editor1" name="editor1" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://www.fckeditor.net/"&gt;FCKeditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+		<script type="text/javascript">
+		//<![CDATA[
+			// Replace the <textarea id="editor1"> with an CKEditor instance.
+			var editor = CKEDITOR.replace( 'editor1',
+				{
+					// Defines a simpler toolbar to be used in this sample.
+					// Note that we have added out "MyButton" button here.
+					toolbar : [ [ 'Source', '-', 'Bold', 'Italic', 'Underline', 'Strike','-','Link', '-', 'MyButton' ] ]
+				});
+
+			// Listen for the "pluginsLoaded" event, so we are sure that the
+			// "dialog" plugin has been loaded and we are able to do our
+			// customizations.
+			editor.on( 'pluginsLoaded', function( ev )
+				{
+					// If our custom dialog has not been registered, do that now.
+					if ( !CKEDITOR.dialog.exists( 'myDialog' ) )
+					{
+						// We need to do the following trick to find out the dialog
+						// definition file URL path. In the real world, you would simply
+						// point to an absolute path directly, like "/mydir/mydialog.js".
+						var href = document.location.href.split( '/' );
+						href.pop();
+						href.push( 'api_dialog', 'my_dialog.js' );
+						href = href.join( '/' );
+
+						// Finally, register the dialog.
+						CKEDITOR.dialog.add( 'myDialog', href );
+					}
+				
+					// Register the command used to open the dialog.
+					editor.addCommand( 'myDialogCmd', new CKEDITOR.dialogCommand( 'myDialog' ) );
+
+					// Add the a custom toolbar buttons, which fires the above
+					// command..
+					editor.ui.addButton( 'MyButton',
+						{
+							label : 'My Dialog',
+							command : 'myDialogCmd'
+						} );
+				});
+		//]]>
+		</script>
+	</div>
+</body>
+</html>
Index: /CKEditor/trunk/_samples/api_dialog/my_dialog.js
===================================================================
--- /CKEditor/trunk/_samples/api_dialog/my_dialog.js	(revision 2997)
+++ /CKEditor/trunk/_samples/api_dialog/my_dialog.js	(revision 2997)
@@ -0,0 +1,28 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add( 'myDialog', function( editor )
+{
+	return {
+		title : 'My Dialog',
+		minWidth : 400,
+		minHeight : 200,
+		contents : [
+			{
+				id : 'tab1',
+				label : 'First Tab',
+				title : 'First Tab',
+				elements :
+				[
+					{
+						id : 'input1',
+						type : 'text',
+						label : 'Input 1'
+					}
+				]
+			}
+		]
+	};
+} );
Index: /CKEditor/trunk/_source/core/editor.js
===================================================================
--- /CKEditor/trunk/_source/core/editor.js	(revision 2996)
+++ /CKEditor/trunk/_source/core/editor.js	(revision 2997)
@@ -191,4 +191,5 @@
 
 						// Load the editor skin.
+						editor.fire( 'pluginsLoaded' );
 						loadSkin( editor );
 					});
@@ -383,5 +384,5 @@
 			var eventData = this._.data;
 
-			if ( !eventData )
+			if ( typeof eventData != 'string' )
 			{
 				var element = this.element;
Index: /CKEditor/trunk/_source/plugins/dialog/dialogDefinition.js
===================================================================
--- /CKEditor/trunk/_source/plugins/dialog/dialogDefinition.js	(revision 2997)
+++ /CKEditor/trunk/_source/plugins/dialog/dialogDefinition.js	(revision 2997)
@@ -0,0 +1,315 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @fileOverview Defines the "virtual" dialog, dialog content and dialog button
+ * definition classes.
+ */
+
+/**
+ * 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
+ * @constructor
+ * @example
+ * // There is no constructor for this class, the user just has to define an
+ * // object with the appropriate properties.
+ *
+ * CKEDITOR.dialog.add( 'testOnly', function( editor )
+ *       {
+ *           return {
+ *               title : 'Test Dialog',
+ *               resizable : CKEDITOR.DIALOG_RESIZE_BOTH,
+ *               minWidth : 500,
+ *               minHeight : 400,
+ *               contents : [
+ *                   {
+ *                       id : 'tab1',
+ *                       label : 'First Tab',
+ *                       title : 'First Tab Title',
+ *                       accessKey : 'Q',
+ *                       elements : [
+ *                           {
+ *                               type : 'text',
+ *                               label : 'Test Text 1',
+ *                               id : 'testText1',
+ *                               'default' : 'hello world!'
+ *                           }
+ *                       ]
+ *                    }
+ *               ]
+ *           };
+ *       });
+ */
+
+/**
+ * The dialog title, displayed in the dialog's header. Required.
+ * @name CKEDITOR.dialog.dialogDefinition.prototype.title
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * How the dialog can be resized, must be one of the four contents defined below.
+ * <br /><br />
+ * <strong>CKEDITOR.DIALOG_RESIZE_NONE</strong><br />
+ * <strong>CKEDITOR.DIALOG_RESIZE_WIDTH</strong><br />
+ * <strong>CKEDITOR.DIALOG_RESIZE_HEIGHT</strong><br />
+ * <strong>CKEDITOR.DIALOG_RESIZE_BOTH</strong><br />
+ * @name CKEDITOR.dialog.dialogDefinition.prototype.resizable
+ * @field
+ * @type Number
+ * @default CKEDITOR.DIALOG_RESIZE_NONE
+ * @example
+ */
+
+/**
+ * The minimum width of the dialog, in pixels.
+ * @name CKEDITOR.dialog.dialogDefinition.prototype.minWidth
+ * @field
+ * @type Number
+ * @default 600
+ * @example
+ */
+
+/**
+ * The minimum height of the dialog, in pixels.
+ * @name CKEDITOR.dialog.dialogDefinition.prototype.minHeight
+ * @field
+ * @type Number
+ * @default 400
+ * @example
+ */
+
+/**
+ * The buttons in the dialog, defined as an array of
+ * {@link CKEDITOR.dialog.buttonDefinition} objects.
+ * @name CKEDITOR.dialog.dialogDefinition.prototype.buttons
+ * @field
+ * @type Array
+ * @default [ CKEDITOR.dialog.okButton, CKEDITOR.dialog.cancelButton ]
+ * @example
+ */
+
+/**
+ * The contents in the dialog, defined as an array of
+ * {@link CKEDITOR.dialog.contentDefinition} objects. Required.
+ * @name CKEDITOR.dialog.dialogDefinition.prototype.contents
+ * @field
+ * @type Array
+ * @example
+ */
+
+/**
+ * The function to execute when OK is pressed.
+ * @name CKEDITOR.dialog.dialogDefinition.prototype.onOk
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * The function to execute when Cancel is pressed.
+ * @name CKEDITOR.dialog.dialogDefinition.prototype.onCancel
+ * @field
+ * @type Function
+ * @example
+ */
+
+/**
+ * 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
+ * @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 content page.
+ * @name CKEDITOR.dialog.contentDefinition.prototype.id
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * The tab label of the content page.
+ * @name CKEDITOR.dialog.contentDefinition.prototype.label
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * The popup message of the tab label.
+ * @name CKEDITOR.dialog.contentDefinition.prototype.title
+ * @field
+ * @type String
+ * @example
+ */
+
+/**
+ * The CTRL hotkey for switching to the tab.
+ * @name CKEDITOR.dialog.contentDefinition.prototype.accessKey
+ * @field
+ * @type String
+ * @example
+ * contentDefinition.accessKey = 'Q';	// Switch to this page when CTRL-Q is pressed.
+ */
+
+/**
+ * The UI elements contained in this content page, defined as an array of
+ * {@link CKEDITOR.dialog.uiElementDefinition} objects.
+ * @name CKEDITOR.dialog.contentDefinition.prototype.elements
+ * @field
+ * @type Array
+ * @example
+ */
+
+/**
+ * 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
+ */
+
+/**
+ * Whether the button is disabled.
+ * @name CKEDITOR.dialog.buttonDefinition.prototype.disabled
+ * @type Boolean
+ * @field
+ * @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
+ */
Index: /CKEditor/trunk/_source/plugins/dialog/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/dialog/plugin.js	(revision 2997)
+++ /CKEditor/trunk/_source/plugins/dialog/plugin.js	(revision 2997)
@@ -0,0 +1,2433 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @fileOverview The floating dialog plugin.
+ */
+
+CKEDITOR.plugins.add( 'dialog',
+	{
+		requires : [ 'dialogui' ]
+	});
+
+/**
+ * No resize for this dialog.
+ * @constant
+ */
+CKEDITOR.DIALOG_RESIZE_NONE = 0;
+
+/**
+ * Only allow horizontal resizing for this dialog, disable vertical resizing.
+ * @constant
+ */
+CKEDITOR.DIALOG_RESIZE_WIDTH = 1;
+
+/**
+ * Only allow vertical resizing for this dialog, disable horizontal resizing.
+ * @constant
+ */
+CKEDITOR.DIALOG_RESIZE_HEIGHT = 2;
+
+/*
+ * Allow the dialog to be resized in both directions.
+ * @constant
+ */
+CKEDITOR.DIALOG_RESIZE_BOTH = 3;
+
+(function()
+{
+	/**
+	 * This is the base class for runtime dialog objects. An instance of this
+	 * class represents a single named dialog for a single editor instance.
+	 * @param {Object} editor The editor which created the dialog.
+	 * @param {String} dialogName The dialog's registered name.
+	 * @constructor
+	 * @example
+	 * var dialogObj = new CKEDITOR.dialog( editor, 'smiley' );
+	 */
+	CKEDITOR.dialog = function( editor, dialogName )
+	{
+		// Load the dialog definition.
+		var definition = CKEDITOR.dialog._.dialogDefinitions[ dialogName ];
+		if ( !definition )
+		{
+			console.log( 'Error: The dialog "' + dialogName + '" is not defined.' );
+			return;
+		}
+
+		// Completes the definition with the default values.
+		definition = CKEDITOR.tools.extend( definition( editor ), defaultDialogDefinition );
+
+		// Create a complex definition object, extending it with the API
+		// functions.
+		definition = new definitionObject( this, definition );
+
+		// Fire the "dialogDefinition" event, making it possible to customize
+		// the dialog definition.
+		definition = CKEDITOR.fire( 'dialogDefinition',
+			{
+				name : dialogName,
+				definition : definition
+			}
+			, editor ).definition;
+
+		var themeBuilt = editor.theme.buildDialog( editor );
+
+		// Initialize some basic parameters.
+		this._ =
+		{
+			editor : editor,
+			element : themeBuilt.element,
+			name : dialogName,
+			definition : definition,
+			size : { width : 0, height : 0 },
+			contents : {},
+			buttons : {},
+			accessKeyMap : {},
+
+			// Initialize the tab and page map.
+			tabs : {},
+			pageCount : 0,
+			lastTab : null
+		};
+
+		/**
+		 * An associative map of elements in the dialog. It has the following members:
+		 * <ul>
+		 * 	<li>tl - top left corner.</li>
+		 * 	<li>tl_resize - resize handle at the top left corner.</li>
+		 * 	<li>t - top side.</li>
+		 * 	<li>t_resize - resize handle at the top.</li>
+		 * 	<li>tr - top right corner.</li>
+		 * 	<li>tr_resize - resize handle at the top right.</li>
+		 * 	<li>l - left side.</li>
+		 * 	<li>l_resize - resize handle at the left side.</li>
+		 * 	<li>c - center area.</li>
+		 * 	<li>r - right side.</li>
+		 * 	<li>r_resize - resize handle at the right side.</li>
+		 * 	<li>bl - bottom left corner.</li>
+		 * 	<li>bl_resize - resize handle at the bottom left.</li>
+		 * 	<li>b - bottom side.</li>
+		 * 	<li>b_resize - resize handle at the bottom.</li>
+		 * 	<li>br - bottom right corner.</li>
+		 * 	<li>br_resize - resize handle at the bottom right.</li>
+		 * 	<li>title - title area.</li>
+		 * 	<li>close - close button.</li>
+		 * 	<li>tabs - tabs area.</li>
+		 * 	<li>contents - the content page area.</li>
+		 * 	<li>footer - the footer area.</li>
+		 * </ul>
+		 * @type Object
+		 * @field
+		 */
+		this.parts = {
+			'tl' : [0,0],
+			'tl_resize' : [0,0,0],
+			't' : [0,1],
+			't_resize' : [0,1,0],
+			'tr' : [0,2],
+			'tr_resize' : [0,2,0],
+			'l' : [1,0],
+			'l_resize' : [1,0,0],
+			'c' : [1,1],
+			'r' : [1,2],
+			'r_resize' : [1,2,0],
+			'bl' : [2,0],
+			'bl_resize' : [2,0,0],
+			'b' : [2,1],
+			'b_resize' : [2,1,0],
+			'br' : [2,2],
+			'br_resize' : [2,2,0],
+			'title' : [1,1,0],
+			'close' : [1,1,0,0],
+			'tabs' : [1,1,1,0,0],
+			'tabs_table' : [1,1,1],
+			'contents' : [1,1,2],
+			'footer' : [1,1,3]
+		};
+
+		// Initialize the parts map.
+		var element = this._.element.getFirst();
+		for ( var i in this.parts )
+			this.parts[i] = element.getChild( this.parts[i] );
+
+		// Call the CKEDITOR.event constructor to initialize this instance.
+		CKEDITOR.event.call( this );
+
+		// Initialize load, show, hide, ok and cancel events.
+		if ( definition.onLoad )
+			this.on( 'load', definition.onLoad );
+
+		if ( definition.onShow )
+			this.on( 'show', definition.onShow );
+
+		if ( definition.onHide )
+			this.on( 'hide', definition.onHide );
+
+		if ( definition.onOk )
+		{
+			this.on( 'ok', function( evt )
+				{
+					if ( definition.onOk.call( this, evt ) === false )
+						evt.data.hide = false;
+				});
+		}
+
+		if ( definition.onCancel )
+		{
+			this.on( 'cancel', function( evt )
+				{
+					if ( definition.onCancel.call( this, evt ) === false )
+						evt.data.hide = false;
+				});
+		}
+
+		var me = this;
+
+		// Iterates over all items inside all content in the dialog, calling a
+		// function for each of them.
+		var iterContents = function( func )
+		{
+			var contents = me._.contents,
+				stop = false;
+
+			for ( var i in contents )
+			{
+				for ( var j in contents[i] )
+				{
+					stop = func.call( this, contents[i][j] );
+					if ( stop )
+						return;
+				}
+			}
+		};
+
+		this.on( 'ok', function( evt )
+			{
+				iterContents( function( item )
+					{
+						if ( item.validate )
+						{
+							var isValid = item.validate( this );
+							
+							if ( typeof isValid == 'string' )
+							{
+								alert( isValid );
+								isValid = false;
+							}
+
+							if ( isValid === false )
+							{
+								if ( item.select )
+									item.select();
+								else
+									item.focus();
+
+								evt.data.hide = false;
+								evt.stop();
+								return true;
+							}
+						}
+					});
+			}, this, null, 0 );
+
+		this.on( 'cancel', function( evt )
+			{
+				iterContents( function( item )
+					{
+						if ( item.isChanged() )
+						{
+							if ( !confirm( editor.lang.common.confirmCancel ) )
+								evt.data.hide = false;
+							return true;
+						}
+					});
+			}, this, null, 0 );
+
+		this.parts.close.on( 'click', function( evt )
+				{
+					if ( this.fire( 'cancel', { hide : true } ).hide !== false )
+						this.hide();
+				}, this );
+
+		// IE6 BUG: Text fields and text areas are only half-rendered the first time the dialog appears in IE6 (#2661).
+		// This is still needed after [2708] and [2709] because text fields in hidden TR tags are still broken.
+		if ( CKEDITOR.env.ie6Compat )
+		{
+			this.on( 'load', function( evt )
+					{
+						var outer = this.getElement(),
+							inner = outer.getFirst();
+						inner.remove();
+						inner.appendTo( outer );
+					}, this );
+		}
+
+		initDragAndDrop( this );
+		initResizeHandles( this );
+
+		// Insert the title.
+		( new CKEDITOR.dom.text( definition.title, CKEDITOR.document ) ).appendTo( this.parts.title );
+
+		// Insert the tabs and contents.
+		for ( i = 0 ; i < definition.contents.length ; i++ )
+			this.addPage( definition.contents[i] );
+
+		var tabRegex = /cke_dialog_tab(\s|$|_)/,
+			tabOuterRegex = /cke_dialog_tab(\s|$)/;
+		this.parts['tabs'].on( 'click', function( evt )
+				{
+					var target = evt.data.getTarget(), firstNode = target, id, page;
+
+					// If we aren't inside a tab, bail out.
+					if ( !tabRegex.test( target.$.className ) )
+						return;
+
+					// Find the outer <td> container of the tab.
+					while ( target.getName() != 'td' || !tabOuterRegex.test( target.$.className ) )
+					{
+						target = target.getParent();
+					}
+					id = target.$.id.substr( 0, target.$.id.lastIndexOf( '_' ) );
+					this.selectPage( id );
+				}, this );
+
+		// Insert buttons.
+		var buttonsHtml = [],
+			buttons = CKEDITOR.dialog._.uiElementBuilders.hbox.build( this,
+				{
+					type : 'hbox',
+					className : 'cke_dialog_footer_buttons',
+					widths : [],
+					children : definition.buttons
+				}, buttonsHtml ).getChild();
+		this.parts.footer.setHtml( buttonsHtml.join( '' ) );
+
+		for ( var i = 0 ; i < buttons.length ; i++ )
+			this._.buttons[ buttons[i].id ] = buttons[i];
+
+		// Insert dummy text box for grabbing focus away from the editing area.
+		this._.dummyText = CKEDITOR.dom.element.createFromHtml( '<input type="text" style="position: absolute; left: -100000px; top: -100000px" />' );
+		this._.dummyText.appendTo( element );
+
+		CKEDITOR.skins.load( editor.config.skin, 'dialog' );
+	};
+
+	CKEDITOR.dialog.prototype =
+	{
+		/**
+		 * Resizes the dialog.
+		 * @param {Number} width The width of the dialog in pixels.
+		 * @param {Number} height The height of the dialog in pixels.
+		 * @function
+		 * @example
+		 * dialogObj.resize( 800, 640 );
+		 */
+		resize : (function()
+		{
+			return function( width, height )
+			{
+				if ( this._.size && this._.size.width == width && this._.size.height == height )
+					return;
+
+				CKEDITOR.dialog.fire( 'resize',
+					{
+						dialog : this,
+						skin : this._.editor.config.skin,
+						width : width,
+						height : height
+					}, this._.editor );
+
+				this._.size = { width : width, height : height };
+			};
+		})(),
+
+		/**
+		 * Gets the current size of the dialog in pixels.
+		 * @returns {Object} An object with "width" and "height" properties.
+		 * @example
+		 * var width = dialogObj.getSize().width;
+		 */
+		getSize : function()
+		{
+			return CKEDITOR.tools.extend( {}, this._.size );
+		},
+
+		/**
+		 * Moves the dialog to an (x, y) coordinate relative to the window.
+		 * @function
+		 * @param {Number} x The target x-coordinate.
+		 * @param {Number} y The target y-coordinate.
+		 * @example
+		 * dialogObj.move( 10, 40 );
+		 */
+		move : (function()
+		{
+			var isFixed;
+			return function( x, y )
+			{
+				// The dialog may be fixed positioned or absolute positioned. Ask the
+				// browser what is the current situation first.
+				if ( isFixed === undefined )
+					isFixed = this._.element.getFirst().getComputedStyle( 'position' ) == 'fixed';
+
+				if ( isFixed && this._.position && this._.position.x == x && this._.position.y == y )
+					return;
+
+				// Save the current position.
+				this._.position = { x : x, y : y };
+
+				// If not fixed positioned, add scroll position to the coordinates.
+				if ( !isFixed )
+				{
+					var scrollPosition = CKEDITOR.document.getWindow().getScrollPosition();
+					x += scrollPosition.x;
+					y += scrollPosition.y;
+				}
+
+				this._.element.getFirst().setStyles(
+						{
+							'left' : x + 'px',
+							'top' : y + 'px'
+						});
+			}
+		})(),
+
+		/**
+		 * Gets the dialog's position in the window.
+		 * @returns {Object} An object with "x" and "y" properties.
+		 * @example
+		 * var dialogX = dialogObj.getPosition().x;
+		 */
+		getPosition : function(){ return CKEDITOR.tools.extend( {}, this._.position ); },
+
+		/**
+		 * Shows the dialog box.
+		 * @example
+		 * dialogObj.show();
+		 */
+		show : function()
+		{
+			// Insert the dialog's element to the root document.
+			var element = this._.element;
+			var definition = this._.definition;
+			if ( !( element.getParent() && element.getParent().equals( CKEDITOR.document.getBody() ) ) )
+				element.appendTo( CKEDITOR.document.getBody() );
+			else
+				return;
+
+			// First, set the dialog to an appropriate size.
+			this.resize( definition.minWidth, definition.minHeight );
+
+			// Rearrange the dialog to the middle of the window.
+			var viewSize = CKEDITOR.document.getWindow().getViewPaneSize();
+			this.move( ( viewSize.width - this._.size.width ) / 2, ( viewSize.height - this._.size.height ) / 2 );
+
+			// Select the first tab by default.
+			this.selectPage( this._.definition.contents[0].id );
+
+			// Reset all inputs back to their default value.
+			this.reset();
+
+			// Set z-index.
+			if ( CKEDITOR.dialog._.currentZIndex === null )
+				CKEDITOR.dialog._.currentZIndex = this._.editor.config.baseFloatZIndex;
+			this._.element.getFirst().setStyle( 'z-index', CKEDITOR.dialog._.currentZIndex += 10 );
+
+			// Maintain the dialog ordering and dialog cover.
+			// Also register key handlers if first dialog.
+			if ( CKEDITOR.dialog._.currentTop == null )
+			{
+				CKEDITOR.dialog._.currentTop = this;
+				this._.parentDialog = null;
+				addCover( this._.editor );
+
+				CKEDITOR.document.on( 'keydown', accessKeyDownHandler );
+				CKEDITOR.document.on( 'keyup', accessKeyUpHandler );
+			}
+			else
+			{
+				this._.parentDialog = CKEDITOR.dialog._.currentTop;
+				var parentElement = this._.parentDialog.getElement().getFirst();
+				parentElement.$.style.zIndex  -= Math.floor( this._.editor.config.baseFloatZIndex / 2 );
+				CKEDITOR.dialog._.currentTop = this;
+			}
+
+			// Register the Esc hotkeys.
+			registerAccessKey( this, this, '\x1b', null, function()
+					{
+						this.getButton( 'cancel' ) && this.getButton( 'cancel' ).click();
+					} );
+
+			// Save editor selection and grab the focus.
+			if ( !this._.parentDialog )
+				this.saveSelection();
+			this._.dummyText.focus();
+			this._.dummyText.$.select();
+
+			// Execute onLoad for the first show.
+			this.fireOnce( 'load', {} );
+			this.fire( 'show', {} );
+		},
+
+		/**
+		 * Executes a function for each UI element.
+		 * @param {Function} fn Function to execute for each UI element.
+		 * @returns {CKEDITOR.dialog} The current dialog object.
+		 */
+		foreach : function( fn )
+		{
+			for ( var i in this._.contents )
+				for ( var j in this._.contents[i] )
+					fn( this._.contents[i][j]);
+			return this;
+		},
+
+		/**
+		 * Resets all input values in the dialog.
+		 * @example
+		 * dialogObj.reset();
+		 * @returns {CKEDITOR.dialog} The current dialog object.
+		 */
+		reset : (function()
+		{
+			var fn = function( widget ){ if ( widget.reset ) widget.reset(); };
+			return function(){ this.foreach( fn ); return this; };
+		})(),
+
+		/**
+		 * Pushes the current values of all inputs in the dialog into the default stack.
+		 * @example
+		 * dialogObj.pushDefault();
+		 * @returns {CKEDITOR.dialog} The current dialog object.
+		 */
+		pushDefault : (function()
+		{
+			var fn = function( widget ){ if ( widget.pushDefault ) widget.pushDefault(); };
+			return function(){ this.foreach( fn ); return this; };
+		})(),
+
+		/**
+		 * Pops the current default values of all inputs in the dialog.
+		 * @example
+		 * dialogObj.popDefault();
+		 * @returns {CKEDITOR.dialog} The current dialog object.
+		 */
+		popDefault : (function()
+		{
+			var fn = function( widget ){ if ( widget.popDefault ) widget.popDefault(); };
+			return function(){ this.foreach( fn ); return this; };
+		})(),
+		
+		setupContent : function()
+		{
+			var args = arguments;
+			this.foreach( function( widget )
+				{
+					if ( widget.setup )
+						widget.setup.apply( widget, args );
+				});
+		},
+
+		commitContent : function()
+		{
+			var args = arguments;
+			this.foreach( function( widget )
+				{
+					if ( widget.commit )
+						widget.commit.apply( widget, args );
+				});
+		},
+
+		/**
+		 * Hides the dialog box.
+		 * @example
+		 * dialogObj.hide();
+		 */
+		hide : function()
+		{
+			// Remove the dialog's element from the root document.
+			var element = this._.element;
+			if ( !element.getParent() )
+				return;
+			element.remove();
+
+			// Unregister all access keys associated with this dialog.
+			unregisterAccessKey( this );
+
+			// Maintain dialog ordering and remove cover if needed.
+			if ( this._.parentDialog == null )
+				removeCover();
+			else
+			{
+				var parentElement = this._.parentDialog.getElement().getFirst();
+				parentElement.setStyle( 'z-index', parseInt( parentElement.$.style.zIndex ) + Math.floor( this._.editor.config.baseFloatZIndex / 2 ) );
+			}
+			CKEDITOR.dialog._.currentTop = this._.parentDialog;
+
+			// Deduct or clear the z-index.
+			if ( this._.parentDialog == null )
+			{
+				CKEDITOR.dialog._.currentZIndex = null;
+
+				// Remove access key handlers.
+				CKEDITOR.document.removeListener( 'keydown', accessKeyDownHandler );
+				CKEDITOR.document.removeListener( 'keyup', accessKeyUpHandler );
+
+				// Restore focus and (if not already restored) selection in the editing area.
+				this.restoreSelection();
+				this._.editor.focus();
+			}
+			else
+				CKEDITOR.dialog._.currentZIndex -= 10;
+
+			this.fire( 'hide', {} );
+		},
+
+		/**
+		 * Adds a tabbed page into the dialog.
+		 * @param {Object} contents Content definition.
+		 * @example
+		 */
+		addPage : function( contents )
+		{
+			var pageHtml = [],
+				titleHtml = contents.title ? 'title="' + CKEDITOR.tools.htmlEncode( contents.title ) + '" ' : '',
+				elements = contents.elements,
+				vbox = CKEDITOR.dialog._.uiElementBuilders.vbox.build( this,
+						{
+							type : 'vbox',
+							className : 'cke_dialog_page_contents',
+							children : contents.elements,
+							expand : !!contents.expand
+						}, pageHtml );
+
+			// Create the HTML for the tab and the content block.
+			var page = CKEDITOR.dom.element.createFromHtml( pageHtml.join( '' ) );
+			var tab = CKEDITOR.dom.element.createFromHtml( [
+					'<table><tbody><tr><td class="cke_dialog_tab" ', titleHtml, '>',
+					'<table border="0" cellspacing="0" cellpadding="0"><tbody><tr>',
+						'<td class="cke_dialog_tab_left"></td>',
+						'<td class="cke_dialog_tab_center">',
+							CKEDITOR.tools.htmlEncode( contents.label.replace( / /g, '\xa0' ) ),
+						'</td>',
+						'<td class="cke_dialog_tab_right"></td>',
+					'</tr></tbody></table></td></tr></tbody></table>'
+				].join( '' ) );
+			tab = tab.getChild( [0,0,0] );
+
+			// First and last tab styles classes.
+			if ( this._.lastTab )
+				this._.lastTab.removeClass( 'last' );
+			tab.addClass( this._.pageCount > 0 ? 'last' : 'first' );
+
+			// If only a single page exist, a different style is used in the central pane.
+			if ( this._.pageCount == 0 )
+				this.parts.c.addClass( 'single_page' );
+			else
+				this.parts.c.removeClass( 'single_page' );
+
+			// Take records for the tabs and elements created.
+			this._.tabs[ contents.id ] = [ tab, page ];
+			this._.pageCount++;
+			this._.lastTab = tab;
+			var contentMap = this._.contents[ contents.id ] = {},
+				cursor,
+				children = vbox.getChild();
+			while ( ( cursor = children.shift() ) )
+			{
+				contentMap[ cursor.id ] = cursor;
+				if ( typeof( cursor.getChild ) == 'function' )
+					children.push.apply( children, cursor.getChild() );
+			}
+
+			// Attach the DOM nodes.
+			tab.unselectable();
+			page.appendTo( this.parts.contents );
+			tab.insertBefore( this.parts.tabs.getChild( this.parts.tabs.getChildCount() - 1 ) );
+			tab.setAttribute( 'id', contents.id + '_' + CKEDITOR.tools.getNextNumber() );
+			page.setAttribute( 'name', contents.id );
+
+			// Add access key handlers if access key is defined.
+			if ( contents.accessKey )
+			{
+				registerAccessKey( this, this, 'CTRL+' + contents.accessKey,
+					tabAccessKeyDown, tabAccessKeyUp );
+				this._.accessKeyMap[ 'CTRL+' + contents.accessKey ] = contents.id;
+			}
+		},
+
+		/**
+		 * Activates a tab page in the dialog by its id.
+		 * @param {String} id The id of the dialog tab to be activated.
+		 * @example
+		 * dialogObj.selectPage( 'tab_1' );
+		 */
+		selectPage : function( id )
+		{
+			// Hide the non-selected tabs and pages.
+			for ( var i in this._.tabs )
+			{
+				var tab = this._.tabs[i][0],
+					page = this._.tabs[i][1];
+				if ( i != id )
+				{
+					tab.removeClass( 'cke_dialog_tab_selected' );
+					page.hide();
+				}
+			}
+
+			var selected = this._.tabs[id];
+			selected[0].addClass( 'cke_dialog_tab_selected' );
+			selected[1].show();
+			var me = this;
+		},
+
+		/**
+		 * Hides a page's tab away from the dialog.
+		 * @param {String} id The page's Id.
+		 * @example
+		 * dialog.hidePage( 'tab_3' );
+		 */
+		hidePage : function( id )
+		{
+			var tab = this._.tabs[id] && this._.tabs[id][0];
+			if ( !tab )
+				return;
+			tab.hide();
+		},
+
+		/**
+		 * Unhides a page's tab.
+		 * @param {String} id The page's Id.
+		 * @example
+		 * dialog.showPage( 'tab_2' );
+		 */
+		showPage : function( id )
+		{
+			var tab = this._.tabs[id] && this._.tabs[id][0];
+			if ( !tab )
+				return;
+			tab.show();
+		},
+
+		/**
+		 * Gets the root DOM element of the dialog.
+		 * @returns {CKEDITOR.dom.element} The &lt;span&gt; element containing this dialog.
+		 * @example
+		 * var dialogElement = dialogObj.getElement().getFirst();
+		 * dialogElement.setStyle( 'padding', '5px' );
+		 */
+		getElement : function()
+		{
+			return this._.element;
+		},
+
+		/**
+		 * Gets a dialog UI element object from a dialog page.
+		 * @param {String} pageId id of dialog page.
+		 * @param {String} elementId id of UI element.
+		 * @example
+		 * @returns {CKEDITOR.ui.dialog.uiElement} The dialog UI element.
+		 */
+		getContentElement : function( pageId, elementId )
+		{
+			return this._.contents[pageId][elementId];
+		},
+
+		/**
+		 * Gets the value of a dialog UI element.
+		 * @param {String} pageId id of dialog page.
+		 * @param {String} elementId id of UI element.
+		 * @example
+		 * @returns {Object} The value of the UI element.
+		 */
+		getValueOf : function( pageId, elementId )
+		{
+			return this.getContentElement( pageId, elementId ).getValue();
+		},
+
+		/**
+		 * Sets the value of a dialog UI element.
+		 * @param {String} pageId id of the dialog page.
+		 * @param {String} elementId id of the UI element.
+		 * @param {Object} value The new value of the UI element.
+		 * @example
+		 */
+		setValueOf : function( pageId, elementId, value )
+		{
+			return this.getContentElement( pageId, elementId ).setValue( value );
+		},
+
+		/**
+		 * Gets the UI element of a button in the dialog's button row.
+		 * @param {String} id The id of the button.
+		 * @example
+		 * @returns {CKEDITOR.ui.dialog.button} The button object.
+		 */
+		getButton : function( id )
+		{
+			return this._.buttons[ id ];
+		},
+
+		/**
+		 * Simulates a click to a dialog button in the dialog's button row.
+		 * @param {String} id The id of the button.
+		 * @example
+		 * @returns The return value of the dialog's "click" event.
+		 */
+		click : function( id )
+		{
+			return this._.buttons[ id ].click();
+		},
+
+		/**
+		 * Disables a dialog button.
+		 * @param {String} id The id of the button.
+		 * @example
+		 */
+		disableButton : function( id )
+		{
+			return this._.buttons[ id ].disable();
+		},
+
+		/**
+		 * Enables a dialog button.
+		 * @param {String} id The id of the button.
+		 * @example
+		 */
+		enableButton : function( id )
+		{
+			return this._.buttons[ id ].enable();
+		},
+
+		/**
+		 * Gets the number of pages in the dialog.
+		 * @returns {Number} Page count.
+		 */
+		getPageCount : function()
+		{
+			return this._.pageCount;
+		},
+
+		/**
+		 * Gets the editor instance which opened this dialog.
+		 * @returns {CKEDITOR.editor} Parent editor instances.
+		 */
+		getParentEditor : function()
+		{
+			return this._.editor;
+		},
+
+		/**
+		 * Saves the current selection position in the editor.
+		 * This function is automatically called when a non-nested dialog is opened,
+		 * but it may also be called by event handlers in dialog definition.
+		 * @example
+		 */
+		saveSelection : function()
+		{
+			if ( this._.editor.mode )
+			{
+				var selection = new CKEDITOR.dom.selection( this._.editor.document );
+				this._.selectedRanges = selection.getRanges();
+			}
+		},
+
+		/**
+		 * Clears the saved selection in the dialog object.
+		 * This function should be called if the dialog's code has already changed the
+		 * current selection position because the dialog closed. (e.g. at onOk())
+		 * @example
+		 */
+		clearSavedSelection : function()
+		{
+			delete this._.selectedRanges;
+		},
+
+		/**
+		 * Restores the editor's selection from the previously saved position in this
+		 * dialog.
+		 * This function is automatically called when a non-nested dialog is closed,
+		 * but it may also be called by event handlers in dialog definition.
+		 * @example
+		 */
+		restoreSelection : function()
+		{
+			if ( this._.editor.mode && this._.selectedRanges )
+				( new CKEDITOR.dom.selection( this._.editor.document ) ).selectRanges( this._.selectedRanges );
+		}
+	};
+
+	CKEDITOR.tools.extend( CKEDITOR.dialog,
+		/**
+		 * @lends CKEDITOR.dialog
+		 */
+		{
+			/**
+			 * Registers a dialog.
+			 * @param {String} name The dialog's name.
+			 * @param {Function|String} dialogDefinition
+			 * 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}.
+			 * @example
+			 * @see CKEDITOR.dialog.dialogDefinition
+			 */
+			add : function( name, dialogDefinition )
+			{
+				this._.dialogDefinitions[name] = dialogDefinition;
+			},
+			
+			exists : function( name )
+			{
+				return !!this._.dialogDefinitions[ name ];
+			},
+
+			/**
+			 * The default OK button for dialogs. Fires the "ok" event and closes the dialog if the event succeeds.
+			 * @static
+			 * @field
+			 * @example
+			 * @type Function
+			 */
+			okButton : (function()
+			{
+				var retval = function( editor, override )
+				{
+					override = override || {};
+					return CKEDITOR.tools.extend( {
+						id : 'ok',
+						type : 'button',
+						label : editor.lang.common.ok,
+						style : 'width: 60px',
+						onClick : function( evt )
+						{
+							var dialog = evt.data.dialog;
+							if ( dialog.fire( 'ok', { hide : true } ).hide !== false )
+								dialog.hide();
+						}
+					}, override, true );
+				};
+				retval.type = 'button';
+				retval.override = function( override )
+				{
+					return CKEDITOR.tools.extend( function( editor ){ return retval( editor, override ); },
+							{ type : 'button' }, true );
+				};
+				return retval;
+			})(),
+
+			/**
+			 * The default cancel button for dialogs. Fires the "cancel" event and closes the dialog if no UI element value changed.
+			 * @static
+			 * @field
+			 * @example
+			 * @type Function
+			 */
+			cancelButton : (function()
+			{
+				var retval = function( editor, override )
+				{
+					override = override || {};
+					return CKEDITOR.tools.extend( {
+						id : 'cancel',
+						type : 'button',
+						label : editor.lang.common.cancel,
+						style : 'width: 60px',
+						onClick : function( evt )
+						{
+							var dialog = evt.data.dialog;
+							if ( dialog.fire( 'cancel', { hide : true } ).hide !== false )
+								dialog.hide();
+						}
+					}, override, true );
+				};
+				retval.type = 'button';
+				retval.override = function( override )
+				{
+					return CKEDITOR.tools.extend( function( editor ){ return retval( editor, override ); },
+							{ type : 'button' }, true );
+				};
+				return retval;
+			})(),
+
+			/**
+			 * Registers a dialog UI element.
+			 * @param {String} typeName The name of the UI element.
+			 * @param {Function} builder The function to build the UI element.
+			 * @example
+			 */
+			addUIElement : function( typeName, builder )
+			{
+				this._.uiElementBuilders[typeName] = builder;
+			},
+
+			/**
+			 * Sets the width of margins of dialogs, which is used for the dialog moving and resizing logic.
+			 * The margin here means the area between the dialog's container <div> and the visual boundary of the dialog.
+			 * Typically this area is used for dialog shadows.
+			 * This function is typically called in a skin's JavaScript files.
+			 * @param {Number} top The top margin in pixels.
+			 * @param {Number} right The right margin in pixels.
+			 * @param {Number} bottom The bottom margin in pixels.
+			 * @param {Number} left The left margin in pixels.
+			 * @example
+			 */
+			setMargins : function( top, right, bottom, left )
+			{
+				this._.margins = [ top, right, bottom, left ];
+			}
+		});
+
+	CKEDITOR.dialog._ =
+	{
+		uiElementBuilders : {},
+
+		dialogDefinitions : {},
+
+		currentTop : null,
+
+		currentZIndex : null,
+
+		margins : [0, 0, 0, 0]
+	};
+
+	// "Inherit" (copy actually) from CKEDITOR.event.
+	CKEDITOR.event.implementOn( CKEDITOR.dialog );
+	CKEDITOR.event.implementOn( CKEDITOR.dialog.prototype );
+
+	var defaultDialogDefinition =
+	{
+		resizable : CKEDITOR.DIALOG_RESIZE_NONE,
+		minWidth : 600,
+		minHeight : 400,
+		buttons : [ CKEDITOR.dialog.okButton, CKEDITOR.dialog.cancelButton ]
+	};
+
+	// Tool function used to return an item from an array based on its id
+	// property.
+	var getById = function( array, id, recurse )
+	{
+		for ( var i = 0, item ; ( item = array[ i ] ) ; i++ )
+		{
+			if ( item.id == id )
+				return item;
+			if ( recurse && item[ recurse ] )
+			{
+				var retval = getById( item[ recurse ], id, recurse ) ;
+				if ( retval )
+					return retval;
+			}
+		}
+		return null;
+	};
+
+	// Tool function used to add an item into an array.
+	var addById = function( array, newItem, nextSiblingId, recurse, nullIfNotFound )
+	{
+		if ( nextSiblingId )
+		{
+			for ( var i = 0, item ; ( item = array[ i ] ) ; i++ )
+			{
+				if ( item.id == nextSiblingId )
+				{
+					array.splice( i, 0, newItem );
+					return newItem;
+				}
+
+				if ( recurse && item[ recurse ] )
+				{
+					var retval = addById( item[ recurse ], newItem, nextSiblingId, recurse, true );
+					if ( retval )
+						return retval;
+				}
+			}
+
+			if ( nullIfNotFound )
+				return null;
+		}
+
+		array.push( newItem );
+		return newItem;
+	};
+
+	// Tool function used to remove an item from an array based on its id.
+	removeById = function( array, id, recurse )
+	{
+		for ( var i = 0, item ; ( item = array[ i ] ) ; i++ )
+		{
+			if ( item.id == id )
+				return array.splice( i, 1 );
+			if ( recurse && item[ recurse ] )
+			{
+				var retval = removeById( item[ recurse ], id, recurse );
+				if ( retval )
+					return retval;
+			}
+		}
+		return null;
+	};
+
+	/**
+	 * This class is not really part of the API. It is the "definition" property value
+	 * passed to "dialogDefinition" event handlers.
+	 * @constructor
+	 * @name CKEDITOR.dialog.dialogDefinitionObject
+	 * @extends CKEDITOR.dialog.dialogDefinition
+	 * @example
+	 * CKEDITOR.on( 'dialogDefinition', function( evt )
+	 * 	{
+	 * 		var definition = evt.data.definition;
+	 * 		var content = definition.getContents( 'page1' );
+	 * 		...
+	 * 	} );
+	 */
+	var definitionObject = function( dialog, dialogDefinition )
+	{
+		// TODO : Check if needed.
+		this.dialog = dialog;
+
+		// Transform the contents entries in contentObjects.
+		var contents = dialogDefinition.contents;
+		for ( var i = 0, content ; ( content = contents[i] ) ; i++ )
+			contents[ i ] = new contentObject( dialog, content );
+
+		CKEDITOR.tools.extend( this, dialogDefinition );
+	};
+
+	definitionObject.prototype =
+	/** @lends CKEDITOR.dialog.dialogDefinitionObject.prototype */
+	{
+		/**
+		 * Gets a content definition.
+		 * @param {String} id The id of the content definition.
+		 * @returns {CKEDITOR.dialog.contentDefinition} The content definition
+		 *		matching id.
+		 */
+		getContents : function( id )
+		{
+			return getById( this.contents, id );
+		},
+
+		/**
+		 * Gets a button definition.
+		 * @param {String} id The id of the button definition.
+		 * @returns {CKEDITOR.dialog.buttonDefinition} The button definition
+		 *		matching id.
+		 */
+		getButton : function( id )
+		{
+			return getById( this.buttons, id );
+		},
+
+		/**
+		 * Adds a content definition object under this dialog definition.
+		 * @param {CKEDITOR.dialog.contentDefinition} contentDefinition The
+		 *		content definition.
+		 * @param {String} [nextSiblingId] The id of an existing content
+		 *		definition which the new content definition will be inserted
+		 *		before. Omit if the new content definition is to be inserted as
+		 *		the last item.
+		 * @returns {CKEDITOR.dialog.contentDefinition} The inserted content
+		 *		definition.
+		 */
+		addContents : function( contentDefinition, nextSiblingId )
+		{
+			return addById( this.contents, contentDefinition, nextSiblingId );
+		},
+
+		/**
+		 * Adds a button definition object under this dialog definition.
+		 * @param {CKEDITOR.dialog.buttonDefinition} buttonDefinition The
+		 *		button definition.
+		 * @param {String} [nextSiblingId] The id of an existing button
+		 *		definition which the new button definition will be inserted
+		 *		before. Omit if the new button definition is to be inserted as
+		 *		the last item.
+		 * @returns {CKEDITOR.dialog.buttonDefinition} The inserted button
+		 *		definition.
+		 */
+		addButton : function( buttonDefinition, nextSiblingId )
+		{
+			return addById( this.buttons, buttonDefinition, nextSiblingId );
+		},
+
+		/**
+		 * 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
+		 *		definition.
+		 */
+		removeContents : function( id )
+		{
+			removeById( this.contents, id );
+		},
+
+		/**
+		 * 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
+		 *		definition.
+		 */
+		removeButton : function( id )
+		{
+			removeById( this.buttons, id );
+		}
+	};
+
+	/**
+	 * This class is not really part of the API. It is the template of the
+	 * objects representing content pages inside the
+	 * CKEDITOR.dialog.dialogDefinitionObject.
+	 * @constructor
+	 * @name CKEDITOR.dialog.contentDefinitionObject
+	 * @example
+	 * CKEDITOR.on( 'dialogDefinition', function( evt )
+	 * 	{
+	 * 		var definition = evt.data.definition;
+	 * 		var content = definition.getContents( 'page1' );
+	 *		content.remove( 'textInput1' );
+	 * 		...
+	 * 	} );
+	 */
+	var contentObject = function( dialog, contentDefinition )
+	{
+		this._ =
+		{
+			dialog : dialog
+		};
+
+		CKEDITOR.tools.extend( this, contentDefinition );
+	};
+
+	contentObject.prototype =
+	/** @lends CKEDITOR.dialog.contentDefinitionObject.prototype */
+	{
+		/**
+		 * Gets a UI element definition under the content definition.
+		 * @param {String} id The id of the UI element definition.
+		 * @returns {CKEDITOR.dialog.uiElementDefinition}
+		 */
+		get : function( id )
+		{
+			return getById( this.elements, id, 'children' );
+		},
+
+		/**
+		 * Adds a UI element definition to the content definition.
+		 * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition The
+		 *		UI elemnet definition to be added.
+		 * @param {String} nextSiblingId The id of an existing UI element
+		 *		definition which the new UI element definition will be inserted
+		 *		before. Omit if the new button definition is to be inserted as
+		 *		the last item.
+		 * @returns {CKEDITOR.dialog.uiElementDefinition} The element
+		 *		definition inserted.
+		 */
+		add : function( elementDefinition, nextSiblingId )
+		{
+			return addById( this.elements, elementDefinition, nextSiblingId, 'children' );
+		},
+
+		/**
+		 * Removes a UI element definition from the content definition.
+		 * @param {String} id The id of the UI element definition to be
+		 *		removed.
+		 * @returns {CKEDITOR.dialog.uiElementDefinition} The element
+		 *		definition removed.
+		 * @example
+		 */
+		remove : function( id )
+		{
+			removeById( this.elements, id, 'children' );
+		}
+	};
+	
+	var initDragAndDrop = function( dialog )
+	{
+		var lastCoords = null,
+			abstractDialogCoords = null,
+			element = dialog.getElement().getFirst(),
+			magnetDistance = dialog._.editor.config.dialog.magnetDistance,
+			mouseMoveHandler = function( evt )
+			{
+				var dialogSize = dialog.getSize(),
+					viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(),
+					x = evt.data.$.screenX,
+					y = evt.data.$.screenY,
+					dx = x - lastCoords.x,
+					dy = y - lastCoords.y,
+					realX, realY;
+
+				lastCoords = { x : x, y : y };
+				abstractDialogCoords.x += dx;
+				abstractDialogCoords.y += dy;
+
+				if ( abstractDialogCoords.x + CKEDITOR.dialog._.margins[3] < magnetDistance )
+					realX = - CKEDITOR.dialog._.margins[3];
+				else if ( abstractDialogCoords.x - CKEDITOR.dialog._.margins[1] > viewPaneSize.width - dialogSize.width - magnetDistance )
+					realX = viewPaneSize.width - dialogSize.width + CKEDITOR.dialog._.margins[1];
+				else
+					realX = abstractDialogCoords.x;
+
+				if ( abstractDialogCoords.y + CKEDITOR.dialog._.margins[0] < magnetDistance )
+					realY = - CKEDITOR.dialog._.margins[0];
+				else if ( abstractDialogCoords.y - CKEDITOR.dialog._.margins[2] > viewPaneSize.height - dialogSize.height - magnetDistance )
+					realY = viewPaneSize.height - dialogSize.height + CKEDITOR.dialog._.margins[2];
+				else
+					realY = abstractDialogCoords.y;
+
+				dialog.move( realX, realY );
+
+				evt.data.preventDefault();
+			},
+			mouseUpHandler = function( evt )
+			{
+				CKEDITOR.document.removeListener( 'mousemove', mouseMoveHandler );
+				CKEDITOR.document.removeListener( 'mouseup', mouseUpHandler );
+
+				if ( CKEDITOR.env.ie6Compat )
+				{
+					var coverDoc = new CKEDITOR.dom.document( frames( 'cke_dialog_background_iframe' ).document );
+					coverDoc.removeListener( 'mousemove', mouseMoveHandler );
+					coverDoc.removeListener( 'mouseup', mouseUpHandler );
+				}
+			};
+
+		dialog.parts.title.on( 'mousedown', function( evt )
+				{
+					lastCoords = { x : evt.data.$.screenX, y : evt.data.$.screenY };
+
+					CKEDITOR.document.on( 'mousemove', mouseMoveHandler );
+					CKEDITOR.document.on( 'mouseup', mouseUpHandler );
+					abstractDialogCoords = dialog.getPosition();
+
+					if ( CKEDITOR.env.ie6Compat )
+					{
+						var coverDoc = new CKEDITOR.dom.document( frames( 'cke_dialog_background_iframe' ).document );
+						coverDoc.on( 'mousemove', mouseMoveHandler );
+						coverDoc.on( 'mouseup', mouseUpHandler );
+					}
+
+					evt.data.preventDefault();
+				}, dialog );
+	};
+	
+	var initResizeHandles = function( dialog )
+	{
+		var definition = dialog._.definition,
+			minWidth = definition.minWidth || 0,
+			minHeight = definition.minHeight || 0,
+			resizable = definition.resizable,
+			topSizer = function( coords, dy )
+			{
+				coords.y += dy;
+			},
+			rightSizer = function( coords, dx )
+			{
+				coords.x2 += dx;
+			},
+			bottomSizer = function( coords, dy )
+			{
+				coords.y2 += dy;
+			},
+			leftSizer = function( coords, dx )
+			{
+				coords.x += dx;
+			},
+			lastCoords = null,
+			abstractDialogCoords = null,
+			magnetDistance = dialog._.editor.config.magnetDistance,
+			parts = [ 'tl', 't', 'tr', 'l', 'r', 'bl', 'b', 'br' ],
+			mouseDownHandler = function( evt )
+			{
+				var partName = evt.listenerData.part, size = dialog.getSize();
+				abstractDialogCoords = dialog.getPosition();
+				CKEDITOR.tools.extend( abstractDialogCoords,
+					{
+						x2 : abstractDialogCoords.x + size.width,
+						y2 : abstractDialogCoords.y + size.height
+					} );
+				lastCoords = { x : evt.data.$.screenX, y : evt.data.$.screenY };
+
+				CKEDITOR.document.on( 'mousemove', mouseMoveHandler, dialog, { part : partName } );
+				CKEDITOR.document.on( 'mouseup', mouseUpHandler, dialog, { part : partName } );
+
+				if ( CKEDITOR.env.ie6Compat )
+				{
+					var coverDoc = new CKEDITOR.dom.document( frames( 'cke_dialog_background_iframe' ).document );
+					coverDoc.on( 'mousemove', mouseMoveHandler, dialog, { part : partName } );
+					coverDoc.on( 'mouseup', mouseUpHandler, dialog, { part : partName } );
+				}
+
+				evt.data.preventDefault();
+			},
+			mouseMoveHandler = function( evt )
+			{
+				var x = evt.data.$.screenX,
+					y = evt.data.$.screenY,
+					dx = x - lastCoords.x,
+					dy = y - lastCoords.y,
+					viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(),
+					partName = evt.listenerData.part;
+
+				if ( partName.search( 't' ) != -1 )
+					topSizer( abstractDialogCoords, dy );
+				if ( partName.search( 'l' ) != -1 )
+					leftSizer( abstractDialogCoords, dx );
+				if ( partName.search( 'b' ) != -1 )
+					bottomSizer( abstractDialogCoords, dy );
+				if ( partName.search( 'r' ) != -1 )
+					rightSizer( abstractDialogCoords, dx );
+
+				lastCoords = { x : x, y : y };
+
+				var realX, realY, realX2, realY2;
+
+				if ( abstractDialogCoords.x + CKEDITOR.dialog._.margins[3] < magnetDistance )
+					realX = - CKEDITOR.dialog._.margins[3];
+				else if ( partName.search( 'l' ) != -1 && abstractDialogCoords.x2 - abstractDialogCoords.x < minWidth + magnetDistance )
+					realX = abstractDialogCoords.x2 - minWidth;
+				else
+					realX = abstractDialogCoords.x;
+
+				if ( abstractDialogCoords.y + CKEDITOR.dialog._.margins[0] < magnetDistance )
+					realY = - CKEDITOR.dialog._.margins[0];
+				else if ( partName.search( 't' ) != -1 && abstractDialogCoords.y2 - abstractDialogCoords.y < minHeight + magnetDistance )
+					realY = abstractDialogCoords.y2 - minHeight;
+				else
+					realY = abstractDialogCoords.y;
+
+				if ( abstractDialogCoords.x2 - CKEDITOR.dialog._.margins[1] > viewPaneSize.width - magnetDistance )
+					realX2 = viewPaneSize.width + CKEDITOR.dialog._.margins[1] ;
+				else if ( partName.search( 'r' ) != -1 && abstractDialogCoords.x2 - abstractDialogCoords.x < minWidth + magnetDistance )
+					realX2 = abstractDialogCoords.x + minWidth;
+				else
+					realX2 = abstractDialogCoords.x2;
+
+				if ( abstractDialogCoords.y2 - CKEDITOR.dialog._.margins[2] > viewPaneSize.height - magnetDistance )
+					realY2= viewPaneSize.height + CKEDITOR.dialog._.margins[2] ;
+				else if ( partName.search( 'b' ) != -1 && abstractDialogCoords.y2 - abstractDialogCoords.y < minHeight + magnetDistance )
+					realY2 = abstractDialogCoords.y + minHeight;
+				else
+					realY2 = abstractDialogCoords.y2 ;
+
+				dialog.move( realX, realY );
+				dialog.resize( realX2 - realX, realY2 - realY );
+
+				evt.data.preventDefault();
+			},
+			mouseUpHandler = function( evt )
+			{
+				CKEDITOR.document.removeListener( 'mouseup', mouseUpHandler );
+				CKEDITOR.document.removeListener( 'mousemove', mouseMoveHandler );
+
+				if ( CKEDITOR.env.ie6Compat )
+				{
+					var coverDoc = new CKEDITOR.dom.document( frames( 'cke_dialog_background_iframe' ).document );
+					coverDoc.removeListener( 'mouseup', mouseUpHandler );
+					coverDoc.removeListener( 'mousemove', mouseMoveHandler );
+				}
+			};
+
+		var widthTest = /[lr]/,
+			heightTest = /[tb]/;
+		for ( var i = 0 ; i < parts.length ; i++ )
+		{
+			var element = dialog.parts[ parts[i] + '_resize' ];
+			if ( resizable == CKEDITOR.DIALOG_RESIZE_NONE ||
+					resizable == CKEDITOR.DIALOG_RESIZE_HEIGHT && widthTest.test( parts[i] ) ||
+			  		resizable == CKEDITOR.DIALOG_RESIZE_WIDTH && heightTest.test( parts[i] ) )
+			{
+				element.hide();
+				continue;
+			}
+			element.on( 'mousedown', mouseDownHandler, dialog, { part : parts[i] } );
+		}
+	};
+	
+	var resizeCover;
+
+	var addCover = function( editor )
+	{
+		var win = CKEDITOR.document.getWindow();
+
+		var html = [
+				'<div style="position: ', ( CKEDITOR.env.ie6Compat ? 'absolute' : 'fixed' ),
+				'; z-index: ', editor.config.baseFloatZIndex,
+				'; top: 0px; left: 0px; ',
+				'background-color: ', editor.config.dialog.backgroundCoverColor,
+				'" id="cke_dialog_background_cover">'
+			];
+			
+		if ( CKEDITOR.env.ie6Compat )
+		{
+			html.push( '<iframe hidefocus="true" frameborder="0" name="cke_dialog_background_iframe" src="javascript: \'\'" ',
+					'style="position: absolute; left: 0px; top: 0px; width: 100%; height: 100%; ',
+					'progid:DXImageTransform.Microsoft.Alpha(opacity=0)" ></iframe>' );
+		}
+		
+		html.push( '</div>' );
+
+		var element = CKEDITOR.dom.element.createFromHtml( html.join( '' ) );
+		
+		var resizeFunc = function()
+		{
+			var size = win.getViewPaneSize();
+			element.setStyles(
+					{
+						width : size.width + 'px',
+						height : size.height + 'px'
+					});
+		};
+		
+		var scrollFunc = function()
+		{
+			var pos = win.getScrollPosition(),
+				cursor = CKEDITOR.dialog._.currentTop;
+			element.setStyles(
+					{
+						left : pos.x + 'px',
+						top : pos.y + 'px'
+					});
+
+			do
+			{
+				var dialogPos = cursor.getPosition();
+				cursor.move( dialogPos.x, dialogPos.y );
+			} while( cursor = cursor._.parentDialog );
+		};
+
+		resizeCover = resizeFunc;
+		win.on( 'resize', resizeFunc );
+		resizeFunc();
+		if ( CKEDITOR.env.ie6Compat )
+		{
+			// IE BUG: win.$.onscroll assignment doesn't work.. it must be window.onscroll.
+			// So we need to invent a really funny way to make it work.
+			var myScrollHandler = function()
+				{
+					scrollFunc();
+					arguments.callee.prevScrollHandler.apply( this, arguments );
+				};
+			win.$.setTimeout( function()
+				{
+					myScrollHandler.prevScrollHandler = window.onscroll || function(){};
+					window.onscroll = myScrollHandler;
+				}, 0 );
+			scrollFunc();
+		}
+		element.setOpacity( editor.config.dialog.backgroundCoverOpacity );
+		element.appendTo( CKEDITOR.document.getBody() );
+	};
+
+	var removeCover = function()
+	{
+		var element = CKEDITOR.document.getById( 'cke_dialog_background_cover' ),
+			win = CKEDITOR.document.getWindow();
+		if ( element )
+		{
+			element.remove();
+			win.removeListener( 'resize', resizeCover );
+
+			if ( CKEDITOR.env.ie6Compat )
+			{
+				win.$.setTimeout( function()
+					{
+						var prevScrollHandler = window.onscroll && window.onscroll.prevScrollHandler;
+						window.onscroll = prevScrollHandler || null;
+					}, 0 );
+			}
+			resizeCover = null;
+		}
+	};
+
+	var accessKeyProcessors = {};
+
+	var accessKeyDownHandler = function( evt )
+	{
+		var ctrl = evt.data.$.ctrlKey || evt.data.$.metaKey,
+			alt = evt.data.$.altKey,
+			shift = evt.data.$.shiftKey,
+			key = String.fromCharCode( evt.data.$.keyCode ),
+			keyProcessor = accessKeyProcessors[( ctrl ? 'CTRL+' : '' ) + ( alt ? 'ALT+' : '') + ( shift ? 'SHIFT+' : '' ) + key];
+
+		if ( !keyProcessor || !keyProcessor.length )
+			return;
+
+		keyProcessor = keyProcessor[keyProcessor.length - 1];
+		keyProcessor.keydown && keyProcessor.keydown.call( keyProcessor.uiElement, keyProcessor.dialog, keyProcessor.key );
+		evt.data.preventDefault();
+	};
+
+	var accessKeyUpHandler = function( evt )
+	{
+		var ctrl = evt.data.$.ctrlKey || evt.data.$.metaKey,
+			alt = evt.data.$.altKey,
+			shift = evt.data.$.shiftKey,
+			key = String.fromCharCode( evt.data.$.keyCode ),
+			keyProcessor = accessKeyProcessors[( ctrl ? 'CTRL+' : '' ) + ( alt ? 'ALT+' : '') + ( shift ? 'SHIFT+' : '' ) + key];
+
+		if ( !keyProcessor || !keyProcessor.length )
+			return;
+
+		keyProcessor = keyProcessor[keyProcessor.length - 1];
+		keyProcessor.keyup && keyProcessor.keyup.call( keyProcessor.uiElement, keyProcessor.dialog, keyProcessor.key );
+		evt.data.preventDefault();
+	};
+
+	var registerAccessKey = function( uiElement, dialog, key, downFunc, upFunc )
+	{
+		var procList = accessKeyProcessors[key] || ( accessKeyProcessors[key] = [] );
+		procList.push( {
+				uiElement : uiElement,
+				dialog : dialog,
+				key : key,
+				keyup : upFunc || uiElement.accessKeyUp,
+				keydown : downFunc || uiElement.accessKeyDown
+			} );
+	};
+
+	var unregisterAccessKey = function( obj )
+	{
+		for ( var i in accessKeyProcessors )
+		{
+			var list = accessKeyProcessors[i];
+			for ( var j = list.length - 1 ; j >= 0 ; j-- )
+			{
+				if ( list[j].dialog == obj || list[j].uiElement == obj )
+					list.splice( j, 1 );
+			}
+			if ( list.length == 0 )
+				delete accessKeyProcessors[i];
+		}
+	};
+
+	var tabAccessKeyUp = function( dialog, key )
+	{
+		if ( dialog._.accessKeyMap[key] )
+			dialog.selectPage( dialog._.accessKeyMap[key] );
+	};
+
+	var tabAccessKeyDown = function( dialog, key )
+	{
+	};
+
+	(function()
+	{
+		var decimalRegex = /^\d+(?:\.\d+)?$/,
+			fixLength = function( length )
+			{
+				return length + ( decimalRegex.test( length ) ? 'px' : '' );
+			}
+
+		CKEDITOR.ui.dialog =
+		{
+			/**
+			 * The base class of all dialog UI elements.
+			 * @constructor
+			 * @param {CKEDITOR.dialog} dialog Parent dialog object.
+			 * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition Element
+			 * definition. Accepted fields:
+			 * <ul>
+			 * 	<li><strong>id</strong> (Required) The id of the UI element. See {@link
+			 * 	CKEDITOR.dialog#getContentElement}</li>
+			 * 	<li><strong>type</strong> (Required) The type of the UI element. The
+			 * 	value to this field specifies which UI element class will be used to
+			 * 	generate the final widget.</li>
+			 * 	<li><strong>title</strong> (Optional) The popup tooltip for the UI
+			 * 	element.</li>
+			 * 	<li><strong>className</strong> (Optional) Additional CSS class names
+			 * 	to add to the UI element. Separated by space.</li>
+			 * 	<li><strong>style</strong> (Optional) Additional CSS inline styles
+			 * 	to add to the UI element. A semicolon (;) is required after the last
+			 * 	style declaration.</li>
+			 * 	<li><strong>accessKey</strong> (Optional) The alphanumeric access key
+			 * 	for this element. Access keys are automatically prefixed by CTRL.</li>
+			 * 	<li><strong>on*</strong> (Optional) Any UI element definition field that
+			 * 	starts with <em>on</em> followed immediately by a capital letter and
+			 * 	probably more letters is an event handler. Event handlers may be further
+			 * 	divided into registered event handlers and DOM event handlers. Please
+			 * 	refer to {@link CKEDITOR.ui.dialog.uiElement#registerEvents} and
+			 * 	{@link CKEDITOR.ui.dialog.uiElement#eventProcessors} for more
+			 * 	information.</li>
+			 * </ul>
+			 * @param {Array} htmlList
+			 * List of HTML code to be added to the dialog's content area.
+			 * @param {Function|String} nodeNameArg
+			 * A function returning a string, or a simple string for the node name for
+			 * the root DOM node. Default is 'div'.
+			 * @param {Function|Object} stylesArg
+			 * A function returning an object, or a simple object for CSS styles applied
+			 * to the DOM node. Default is empty object.
+			 * @param {Function|Object} attributesArg
+			 * A fucntion returning an object, or a simple object for attributes applied
+			 * to the DOM node. Default is empty object.
+			 * @param {Function|String} contentsArg
+			 * A function returning a string, or a simple string for the HTML code inside
+			 * the root DOM node. Default is empty string.
+			 * @example
+			 */
+			uiElement : function( dialog, elementDefinition, htmlList, nodeNameArg, stylesArg, attributesArg, contentsArg )
+			{
+				if (arguments.length < 4 )
+					return;
+
+				var nodeName = ( nodeNameArg.call ? nodeNameArg( elementDefinition ) : nodeNameArg ) || 'div',
+					html = [ '<', nodeName, ' ' ],
+					styles = ( stylesArg && stylesArg.call ? stylesArg( elementDefinition ) : stylesArg ) || {},
+					attributes = ( attributesArg && attributesArg.call ? attributesArg( elementDefinition ) : attributesArg ) || {},
+					innerHTML = ( contentsArg && contentsArg.call ? contentsArg( dialog, elementDefinition ) : contentsArg ) || '',
+					domId = this.domId = attributes.id || CKEDITOR.tools.getNextNumber() + '_uiElement',
+					id = this.id = elementDefinition.id,
+					i;
+
+				// Set the id, a unique id is required for getElement() to work.
+				attributes.id = domId;
+
+				// Set the type and definition CSS class names.
+				var classes = {};
+				if ( elementDefinition.type )
+					classes[ 'cke_dialog_ui_' + elementDefinition.type ] = 1;
+				if ( elementDefinition.className )
+					classes[ elementDefinition.className ] = 1;
+				var attributeClasses = ( attributes['class'] && attributes['class'].split ) ? attributes['class'].split( ' ' ) : [];
+				for ( i = 0 ; i < attributeClasses.length ; i++ )
+				{
+					if ( attributeClasses[i] )
+						classes[ attributeClasses[i] ] = 1;
+				}
+				var finalClasses = [];
+				for ( i in classes )
+					finalClasses.push( i );
+				attributes['class'] = finalClasses.join( ' ' );
+
+				// Set the popup tooltop.
+				if ( elementDefinition.title )
+					attributes.title = elementDefinition.title;
+
+				// Write the inline CSS styles.
+				var styleStr = ( elementDefinition.style || '' ).split( ';' );
+				for ( i in styles )
+					styleStr.push( i + ':' + styles[i] );
+				for ( i = styleStr.length - 1 ; i >= 0 ; i-- )
+				{
+					if ( styleStr[i] === '' )
+						styleStr.splice( i, 1 );
+				}
+				if ( styleStr.length > 0 )
+					attributes.style = ( attributes.style || '' ) + styleStr.join( '; ' );
+
+				// Write the attributes.
+				for ( i in attributes )
+					html.push( i + '="' + CKEDITOR.tools.htmlEncode( attributes[i] ) + '" ');
+
+				// Write the content HTML.
+				html.push( '>', innerHTML, '</', nodeName, '>' );
+
+				// Add contents to the parent HTML array.
+				htmlList.push( html.join( '' ) );
+
+				( this._ || ( this._ = {} ) ).dialog = dialog;
+
+				// Override isChanged if it is defined in element definition.
+				if ( typeof( elementDefinition.isChanged ) == 'boolean' )
+					this.isChanged = function(){ return elementDefinition.isChanged; };
+				if ( typeof( elementDefinition.isChanged ) == 'function' )
+					this.isChanged = elementDefinition.isChanged;
+
+				// Add events.
+				CKEDITOR.event.implementOn( this );
+
+				this.registerEvents( elementDefinition );
+				if ( this.accessKeyUp && this.accessKeyDown && elementDefinition.accessKey )
+					registerAccessKey( this, dialog, 'CTRL+' + elementDefinition.accessKey );
+
+				// Completes this object with everything we have in the
+				// definition.
+				CKEDITOR.tools.extend( this, elementDefinition );
+			},
+
+			/**
+			 * Horizontal layout box for dialog UI elements, auto-expends to available width of container.
+			 * @constructor
+			 * @extends CKEDITOR.ui.dialog.uiElement
+			 * @param {CKEDITOR.dialog} dialog
+			 * Parent dialog object.
+			 * @param {Array} childObjList
+			 * Array of {@link CKEDITOR.ui.dialog.uiElement} objects inside this
+			 * container.
+			 * @param {Array} childHtmlList
+			 * Array of HTML code that correspond to the HTML output of all the
+			 * objects in childObjList.
+			 * @param {Array} htmlList
+			 * Array of HTML code that this element will output to.
+			 * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition
+			 * The element definition. Accepted fields:
+			 * <ul>
+			 * 	<li><strong>widths</strong> (Optional) The widths of child cells.</li>
+			 * 	<li><strong>height</strong> (Optional) The height of the layout.</li>
+			 * 	<li><strong>padding</strong> (Optional) The padding width inside child
+			 * 	 cells.</li>
+			 * 	<li><strong>align</strong> (Optional) The alignment of the whole layout
+			 * 	</li>
+			 * </ul>
+			 * @example
+			 */
+			hbox : function( dialog, childObjList, childHtmlList, htmlList, elementDefinition )
+			{
+				if ( arguments.length < 4 )
+					return;
+
+				this._ || ( this._ = {} );
+
+				var children = this._.children = childObjList,
+					widths = elementDefinition && elementDefinition.widths || null,
+					height = elementDefinition && elementDefinition.height || null,
+					styles = {},
+					i;
+				/** @ignore */
+				var innerHTML = function()
+				{
+					var html = [ '<tbody><tr class="cke_dialog_ui_hbox">' ];
+					for ( i = 0 ; i < childHtmlList.length ; i++ )
+					{
+						var className = 'cke_dialog_ui_hbox_child',
+							styles = [];
+						if ( i === 0 )
+							className = 'cke_dialog_ui_hbox_first';
+						if ( i == childHtmlList.length - 1 )
+							className = 'cke_dialog_ui_hbox_last';
+						html.push( '<td class="', className, '" ' );
+						if ( widths )
+						{
+							if ( widths[i] )
+								styles.push( 'width:' + fixLength( widths[i] ) );
+						}
+						else
+							styles.push( 'width:' + Math.floor( 100 / childHtmlList.length ) + '%' );
+						if ( height )
+							styles.push( 'height:' + fixLength( height ) );
+						if ( elementDefinition && elementDefinition.padding != undefined )
+							styles.push( 'padding:' + fixLength( elementDefinition.padding ) );
+						if ( styles.length > 0 )
+							html.push( 'style="' + styles.join('; ') + '" ' );
+						html.push( '>', childHtmlList[i], '</td>' );
+					}
+					html.push( '</tr></tbody>' );
+					return html.join( '' );
+				};
+
+				CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition || { type : 'hbox' }, htmlList, 'table', styles,
+						{ align : ( elementDefinition && elementDefinition.align ) ||
+							( dialog.getParentEditor().lang.dir == 'ltr' ? 'left' : 'right' ) }, innerHTML );
+			},
+
+			/**
+			 * Vertical layout box for dialog UI elements.
+			 * @constructor
+			 * @extends CKEDITOR.ui.dialog.hbox
+			 * @param {CKEDITOR.dialog} dialog
+			 * Parent dialog object.
+			 * @param {Array} childObjList
+			 * Array of {@link CKEDITOR.ui.dialog.uiElement} objects inside this
+			 * container.
+			 * @param {Array} childHtmlList
+			 * Array of HTML code that correspond to the HTML output of all the
+			 * objects in childObjList.
+			 * @param {Array} htmlList
+			 * Array of HTML code that this element will output to.
+			 * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition
+			 * The element definition. Accepted fields:
+			 * <ul>
+			 * 	<li><strong>width</strong> (Optional) The width of the layout.</li>
+			 * 	<li><strong>heights</strong> (Optional) The heights of individual cells.
+			 * 	</li>
+			 * 	<li><strong>align</strong> (Optional) The alignment of the layout.</li>
+			 * 	<li><strong>padding</strong> (Optional) The padding width inside child
+			 * 	cells.</li>
+			 * 	<li><strong>expand</strong> (Optional) Whether the layout should expand
+			 * 	vertically to fill its container.</li>
+			 * </ul>
+			 * @example
+			 */
+			vbox : function( dialog, childObjList, childHtmlList, htmlList, elementDefinition )
+			{
+				if (arguments.length < 3 )
+					return;
+
+				this._ || ( this._ = {} );
+
+				var children = this._.children = childObjList,
+					width = elementDefinition && elementDefinition.width || null,
+					heights = elementDefinition && elementDefinition.heights || null;
+				/** @ignore */
+				var innerHTML = function()
+				{
+					var html = [ '<table cellspacing="0" border="0" ' ];
+					html.push( 'style="' );
+					if ( elementDefinition && elementDefinition.expand )
+						html.push( 'height:100%;' );
+					html.push( 'width:' + fixLength( width || '100%' ), ';' );
+					html.push( '"' );
+					html.push( 'align="', CKEDITOR.tools.htmlEncode(
+						( elementDefinition && elementDefinition.align ) || ( dialog.getParentEditor().lang.dir == 'ltr' ? 'left' : 'right' ) ), '" ' );
+
+					html.push( '><tbody>' );
+					for ( var i = 0 ; i < childHtmlList.length ; i++ )
+					{
+						var styles = [];
+						html.push( '<tr><td ' );
+						if ( width )
+							styles.push( 'width:' + fixLength( width || '100%' ) );
+						if ( heights )
+							styles.push( 'height:' + fixLength( heights[i] ) );
+						else if ( elementDefinition && elementDefinition.expand )
+							styles.push( 'height:' + Math.floor( 100 / childHtmlList.length ) + '%' );
+						if ( elementDefinition && elementDefinition.padding != undefined )
+							styles.push( 'padding:' + fixLength( elementDefinition.padding ) );
+						if ( styles.length > 0 )
+							html.push( 'style="', styles.join( '; ' ), '" ' );
+						html.push( ' class="cke_dialog_ui_vbox_child">', childHtmlList[i], '</td></tr>' );
+					}
+					html.push( '</tbody></table>' );
+					return html.join( '' );
+				};
+				CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition || { type : 'vbox' }, htmlList, 'div', null, null, innerHTML );
+			}
+		};
+	})();
+
+	CKEDITOR.ui.dialog.uiElement.prototype =
+	{
+		/**
+		 * Gets the root DOM element of this dialog UI object.
+		 * @returns {CKEDITOR.dom.element} Root DOM element of UI object.
+		 * @example
+		 * uiElement.getElement().hide();
+		 */
+		getElement : function()
+		{
+			return CKEDITOR.document.getById( this.domId );
+		},
+
+		/**
+		 * Gets the DOM element that the user inputs values.
+		 * This function is used by setValue(), getValue() and focus(). It should
+		 * be overrided in child classes where the input element isn't the root
+		 * element.
+		 * @returns {CKEDITOR.dom.element} The element where the user input values.
+		 * @example
+		 * var rawValue = textInput.getInputElement().$.value;
+		 */
+		getInputElement : function()
+		{
+			return this.getElement();
+		},
+
+		/**
+		 * Gets the parent dialog object containing this UI element.
+		 * @returns {CKEDITOR.dialog} Parent dialog object.
+		 * @example
+		 * var dialog = uiElement.getDialog();
+		 */
+		getDialog : function()
+		{
+			return this._.dialog;
+		},
+
+		/**
+		 * Sets the value of this dialog UI object.
+		 * @param {Object} value The new value.
+		 * @returns {CKEDITOR.dialog.uiElement} The current UI element.
+		 * @example
+		 * uiElement.setValue( 'Dingo' );
+		 */
+		setValue : function( value )
+		{
+			this.getInputElement().setValue( value );
+			this.fire( 'change', { value : value } );
+			return this;
+		},
+
+		/**
+		 * Gets the current value of this dialog UI object.
+		 * @returns {Object} The current value.
+		 * @example
+		 * var myValue = uiElement.getValue();
+		 */
+		getValue : function()
+		{
+			return this.getInputElement().getValue();
+		},
+
+		/**
+		 * Tells whether the UI object's value has changed.
+		 * @returns {Boolean} true if changed, false if not changed.
+		 * @example
+		 * if ( uiElement.isChanged() )
+		 * &nbsp;&nbsp;confirm( 'Value changed! Continue?' );
+		 */
+		isChanged : function()
+		{
+			// Override in input classes.
+			return false;
+		},
+
+		/**
+		 * Selects the parent tab of this element. Usually called by focus() or overridden focus() methods.
+		 * @returns {CKEDITOR.dialog.uiElement} The current UI element.
+		 * @example
+		 * focus : function()
+		 * {
+		 * 		this.selectParentTab();
+		 * 		// do something else.
+		 * }
+		 */
+		selectParentTab : function()
+		{
+			var element = this.getInputElement(),
+				cursor = element,
+				tabId;
+			while ( ( cursor = cursor.getParent() ) && cursor.$.className.search( 'cke_dialog_page_contents' ) == -1 );
+			tabId = cursor.getAttribute( 'name' );
+
+			this._.dialog.selectPage( tabId );
+			return this;
+		},
+
+		/**
+		 * Puts the focus to the UI object. Switches tabs if the UI object isn't in the active tab page.
+		 * @returns {CKEDITOR.dialog.uiElement} The current UI element.
+		 * @example
+		 * uiElement.focus();
+		 */
+		focus : function()
+		{
+			this.selectParentTab().getInputElement().focus();
+			return this;
+		},
+
+		/**
+		 * Registers the on* event handlers defined in the element definition.
+		 * The default behavior of this function is:
+		 * <ol>
+		 *  <li>
+		 *  	If the on* event is defined in the class's eventProcesors list,
+		 *  	then the registration is delegated to the corresponding function
+		 *  	in the eventProcessors list.
+		 *  </li>
+		 *  <li>
+		 *  	If the on* event is not defined in the eventProcessors list, then
+		 *  	register the event handler under the corresponding DOM event of
+		 *  	the UI element's input DOM element (as defined by the return value
+		 *  	of {@link CKEDITOR.ui.dialog.uiElement#getInputElement}).
+		 *  </li>
+		 * </ol>
+		 * 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
+		 * definition.
+		 * @returns {CKEDITOR.dialog.uiElement} The current UI element.
+		 * @example
+		 */
+		registerEvents : function( definition )
+		{
+			var regex = /^on([A-Z]\w+)/,
+				match;
+				
+			var registerDomEvent = function( uiElement, dialog, eventName, func )
+			{
+				dialog.on( 'load', function()
+				{
+					uiElement.getInputElement().on( eventName, func, uiElement );
+				});
+			};
+
+			for ( var i in definition )
+			{
+				if ( !( match = i.match( regex ) ) )
+					continue;
+				if ( this.eventProcessors[i] )
+					this.eventProcessors[i].call( this, this._.dialog, definition[i] );
+				else
+					registerDomEvent( this, this._.dialog, match[1].toLowerCase(), definition[i] );
+			}
+
+			return this;
+		},
+
+		/**
+		 * The event processor list used by
+		 * {@link CKEDITOR.ui.dialog.uiElement#getInputElement} at UI element
+		 * instantiation. The default list defines three on* events:
+		 * <ol>
+		 *  <li>onLoad - Called when the element's parent dialog opens for the
+		 *  first time</li>
+		 *  <li>onShow - Called whenever the element's parent dialog opens.</li>
+		 *  <li>onHide - Called whenever the element's parent dialog closes.</li>
+		 * </ol>
+		 * @field
+		 * @type Object
+		 * @example
+		 * // This connects the 'click' event in CKEDITOR.ui.dialog.button to onClick
+		 * // handlers in the UI element's definitions.
+		 * CKEDITOR.ui.dialog.button.eventProcessors = CKEDITOR.tools.extend( {},
+		 * &nbsp;&nbsp;CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,
+		 * &nbsp;&nbsp;{ onClick : function( dialog, func ) { this.on( 'click', func ); } },
+		 * &nbsp;&nbsp;true );
+		 */
+		eventProcessors :
+		{
+			onLoad : function( dialog, func )
+			{
+				dialog.on( 'load', func );
+			},
+
+			onShow : function( dialog, func )
+			{
+				dialog.on( 'show', func );
+			},
+
+			onHide : function( dialog, func )
+			{
+				dialog.on( 'hide', func );
+			}
+		},
+
+		/**
+		 * The default handler for a UI element's access key down event, which
+		 * tries to put focus to the UI element.<br />
+		 * Can be overridded in child classes for more sophisticaed behavior.
+		 * @param {CKEDITOR.dialog} dialog The parent dialog object.
+		 * @param {String} key The key combination pressed. Since access keys
+		 * are defined to always include the CTRL key, its value should always
+		 * include a 'CTRL+' prefix.
+		 * @example
+		 */
+		accessKeyDown : function( dialog, key )
+		{
+			this.focus();
+		},
+
+		/**
+		 * The default handler for a UI element's access key up event, which
+		 * does nothing.<br />
+		 * Can be overridded in child classes for more sophisticated behavior.
+		 * @param {CKEDITOR.dialog} dialog The parent dialog object.
+		 * @param {String} key The key combination pressed. Since access keys
+		 * are defined to always include the CTRL key, its value should always
+		 * include a 'CTRL+' prefix.
+		 * @example
+		 */
+		accessKeyUp : function( dialog, key )
+		{
+		},
+
+		/**
+		 * Disables a UI element.
+		 * @example
+		 */
+		disable : function()
+		{
+			var element = this.getInputElement();
+			element.setAttribute( 'disabled', 'true' );
+			element.addClass( 'cke_disabled' );
+		},
+
+		/**
+		 * Enables a UI element.
+		 * @example
+		 */
+		enable : function()
+		{
+			var element = this.getInputElement();
+			element.removeAttribute( 'disabled' );
+			element.removeClass( 'cke_disabled' );
+		}
+	};
+
+	CKEDITOR.ui.dialog.hbox.prototype = CKEDITOR.tools.extend( new CKEDITOR.ui.dialog.uiElement,
+		/**
+		 * @lends CKEDITOR.ui.dialog.hbox.prototype
+		 */
+		{
+			/**
+			 * Gets a child UI element inside this container.
+			 * @param {Array|Number} indices An array or a single number to indicate the child's
+			 * position in the container's descendant tree. Omit to get all the children in an array.
+			 * @returns {Array|CKEDITOR.ui.dialog.uiElement} Array of all UI elements in the container
+			 * if no argument given, or the specified UI element if indices is given.
+			 * @example
+			 * var checkbox = hbox.getChild( [0,1] );
+			 * checkbox.setValue( true );
+			 */
+			getChild : function( indices )
+			{
+				// If no arguments, return a clone of the children array.
+				if ( arguments.length < 1 )
+					return this._.children.concat();
+
+				// If indices isn't array, make it one.
+				if ( !indices.splice )
+					indices = [ indices ];
+
+				// Retrieve the child element according to tree position.
+				if ( indices.length < 2 )
+					return this._.children[ indices[0] ];
+				else
+					return ( this._.children[ indices[0] ] && this._.children[ indices[0] ].getChild ) ?
+						this._.children[ indices[0] ].getChild( indices.slice( 1, indices.length ) ) :
+						null;
+			}
+		}, true );
+
+	CKEDITOR.ui.dialog.vbox.prototype = new CKEDITOR.ui.dialog.hbox();
+
+
+
+	(function()
+	{
+		var commonBuilder = {
+			build : function( dialog, elementDefinition, output )
+			{
+				var children = elementDefinition.children,
+					child,
+					childHtmlList = [],
+					childObjList = [];
+				for ( var i = 0 ; ( i < children.length && ( child = children[i] ) ) ; i++ )
+				{
+					var childHtml = [];
+					childHtmlList.push( childHtml );
+					childObjList.push( CKEDITOR.dialog._.uiElementBuilders[ child.type ].build( dialog, child, childHtml ) );
+				}
+				return new CKEDITOR.ui.dialog[elementDefinition.type]( dialog, childObjList, childHtmlList, output, elementDefinition );
+			}
+		};
+
+		CKEDITOR.dialog.addUIElement( 'hbox', commonBuilder );
+		CKEDITOR.dialog.addUIElement( 'vbox', commonBuilder );
+	})();
+
+	/**
+	 * Generic dialog command. It opens a specific dialog when executed.
+	 * @constructor
+	 * @augments CKEDITOR.commandDefinition
+	 * @param {string} dialogName The name of the dialog to open when executing
+	 *		this command.
+	 * @example
+	 * // Register the "link" command, which opens the "link" dialog.
+	 * editor.addCommand( 'link', <b>new CKEDITOR.dialogCommand( 'link' )</b> );
+	 */
+	CKEDITOR.dialogCommand = function( dialogName )
+	{
+		this.dialogName = dialogName;
+	};
+
+	CKEDITOR.dialogCommand.prototype =
+	{
+		/** @ignore */
+		exec : function( editor )
+		{
+			editor.openDialog( this.dialogName );
+		}
+	};
+
+	(function()
+	{
+		var notEmptyRegex = /^([a]|[^a])+$/,
+			integerRegex = /^\d*$/,
+			numberRegex = /^\d*(?:\.\d+)?$/;
+
+		CKEDITOR.VALIDATE_OR = 1;
+		CKEDITOR.VALIDATE_AND = 2;
+
+		CKEDITOR.dialog.validate =
+		{
+			functions : function()
+			{
+				return function()
+				{
+					/**
+					 * It's important for validate functions to be able to accept the value
+					 * as argument in addition to this.getValue(), so that it is possible to
+					 * combine validate functions together to make more sophisticated
+					 * validators.
+					 */
+					var value = this && this.getValue ? this.getValue() : arguments[0];
+
+					var msg = undefined,
+						relation = CKEDITOR.VALIDATE_AND,
+						functions = [], i;
+
+					for ( i = 0 ; i < arguments.length ; i++ )
+					{
+						if ( typeof( arguments[i] ) == 'function' )
+							functions.push( arguments[i] );
+						else
+							break;
+					}
+
+					if ( i < arguments.length && typeof( arguments[i] ) == 'string' )
+					{
+						msg = arguments[i];
+						i++;
+					}
+
+					if ( i < arguments.length && typeof( arguments[i]) == 'number' )
+						relation = arguments[i];
+
+					var passed = ( relation == CKEDITOR.VALIDATE_AND ? true : false );
+					for ( i = 0 ; i < functions.length ; i++ )
+					{
+						if ( relation == CKEDITOR.VALIDATE_AND )
+							passed = passed && functions[i]( value );
+						else
+							passed = passed || functions[i]( value );
+					}
+
+					if ( !passed )
+					{
+						if ( msg !== undefined )
+							alert( msg );
+						if ( this && ( this.select || this.focus ) )
+							( this.select || this.focus )();
+						return false;
+					}
+
+					return true;
+				};
+			},
+
+			regex : function( regex, msg )
+			{
+				/*
+				 * Can be greatly shortened by deriving from functions validator if code size
+				 * turns out to be more important than performance.
+				 */
+				return function()
+				{
+					var value = this && this.getValue ? this.getValue() : arguments[0];
+					if ( !regex.test( value ) )
+					{
+						if ( msg !== undefined )
+							alert( msg );
+						if ( this && ( this.select || this.focus ) )
+						{
+							if ( this.select )
+								this.select();
+							else
+								this.focus();
+						}
+						return false;
+					}
+					return true;
+				}
+			},
+
+			notEmpty : function( msg )
+			{
+				return this.regex( notEmptyRegex, msg );
+			},
+
+			integer : function( msg )
+			{
+				return this.regex( integerRegex, msg );
+			},
+
+			'number' : function( msg )
+			{
+				return this.regex( numberRegex, msg );
+			},
+
+			equals : function( value, msg )
+			{
+				return this.functions( function( val ){ return val == value; }, msg );
+			},
+
+			notEqual : function( value, msg )
+			{
+				return this.functions( function( val ){ return val != value; }, msg );
+			}
+		};
+	})();
+
+})();
+
+// Extend the CKEDITOR.editor class with dialog specific functions.
+CKEDITOR.tools.extend( CKEDITOR.editor.prototype,
+	/** @lends CKEDITOR.editor.prototype */
+	{
+		/**
+		 * Loads and opens a registered dialog.
+		 * @param {String} dialogName The registered name of the dialog.
+		 * @see CKEDITOR.dialog.add
+		 * @example
+		 * CKEDITOR.instances.editor1.openDialog( 'smiley' );
+		 * @returns {CKEDITOR.dialog} The dialog object corresponding to the dialog displayed. null if the dialog name is not registered.
+		 */
+		openDialog : function( dialogName )
+		{
+			var dialogDefinitions = CKEDITOR.dialog._.dialogDefinitions[ dialogName ];
+			
+			// If the dialogDefinition is already loaded, open it immediately.
+			if ( typeof dialogDefinitions == 'function' )
+			{
+				var storedDialogs = this._.storedDialogs || 
+					( this._.storedDialogs = {} );
+				
+				var dialog = storedDialogs[ dialogName ] || 
+					( storedDialogs[ dialogName ] = new CKEDITOR.dialog( this, dialogName ) );
+
+				dialog.show();
+
+				return dialog;
+			}
+
+			// Not loaded? Load the .js file first.
+			var body = CKEDITOR.document.getBody(),
+				cursor = body.$.style.cursor,
+				me = this;
+
+			body.setStyle( 'cursor', 'wait' );
+			CKEDITOR.scriptLoader.load( CKEDITOR.getUrl( dialogDefinitions ), function()
+				{
+					me.openDialog( dialogName );
+					body.setStyle( 'cursor', cursor );
+				} );
+		}
+	});
+
+// Dialog related configurations.
+CKEDITOR.config.dialog =
+{
+	/**
+	 * The color of the dialog background cover. It should be a valid CSS color string.
+	 * @type String
+	 * @default white
+	 * @example
+	 * backgroundCoverColor = 'rgb(255, 254, 253)';
+	 */
+	backgroundCoverColor : 'white',
+
+	/**
+	 * The opacity of the dialog background cover. It should be a number within the range [0.0, 1.0].
+	 * @type Number
+	 * @default 0.5
+	 * @example
+	 * backgroundCoverOpacity = 0.7;
+	 */
+	backgroundCoverOpacity : 0.5,
+
+	/**
+	 * The distance of magnetic borders used in moving and resizing dialogs, measured in pixels.
+	 * @type Number
+	 * @default 20
+	 * @example
+	 * magnetic = 30;
+	 */
+	magnetDistance : 20
+};
Index: /CKEditor/trunk/_source/plugins/dialogui/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/dialogui/plugin.js	(revision 2997)
+++ /CKEditor/trunk/_source/plugins/dialogui/plugin.js	(revision 2997)
@@ -0,0 +1,1201 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/** @fileoverview The "dialogui" plugin. */
+
+CKEDITOR.plugins.add( 'dialogui' );
+
+(function()
+{
+	var initPrivateObject = function( elementDefinition )
+	{
+		this._ || ( this._ = {} );
+		this._['default'] = [ elementDefinition['default'] || '' ];
+		var args = [ this._ ];
+		for ( var i = 1 ; i < arguments.length ; i++ )
+			args.push( arguments[i] );
+		args.push( true );
+		CKEDITOR.tools.extend.apply( CKEDITOR.tools, args );
+		return this._;
+	},
+	textBuilder =
+	{
+		build : function( dialog, elementDefinition, output )
+		{
+			return new CKEDITOR.ui.dialog.textInput( dialog, elementDefinition, output );
+		}
+	},
+	commonBuilder =
+	{
+		build : function( dialog, elementDefinition, output )
+		{
+			return new CKEDITOR.ui.dialog[elementDefinition.type]( dialog, elementDefinition, output );
+		}
+	},
+	commonPrototype =
+	{
+		isChanged : function()
+		{
+			return this.getValue() != this.getDefault();
+		},
+
+		reset : function()
+		{
+			this.setValue( this.getDefault() );
+		},
+
+		getDefault : function()
+		{
+			var defs = this._['default'];
+			return defs[ defs.length - 1 ];
+		},
+
+		pushDefault : function()
+		{
+			this._['default'].push( this.getValue() );
+		},
+
+		popDefault : function()
+		{
+			this._['default'].pop();
+		}
+	},
+	commonEventProcessors = CKEDITOR.tools.extend( {}, CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,
+		{
+			onChange : function( dialog, func )
+			{
+				if ( !this._.domOnChangeRegistered )
+				{
+					dialog.on( 'load', function()
+						{
+							this.getInputElement().on( 'change', function(){ this.fire( 'change', { value : this.getValue() } ); }, this );
+						}, this );
+					this._.domOnChangeRegistered = true;
+				}
+
+				this.on( 'change', func );
+			}
+		}, true ),
+	eventRegex = /^on([A-Z]\w+)/,
+	cleanInnerDefinition = function( def )
+	{
+		// An inner UI element should not have the parent's type, title or events.
+		for ( var i in def )
+		{
+			if ( eventRegex.test( i ) || i == 'title' || i == 'type' )
+				delete def[i];
+		}
+		return def;
+	}
+
+	CKEDITOR.tools.extend( CKEDITOR.ui.dialog,
+		/** @lends CKEDITOR.ui.dialog */
+		{
+			/**
+			 * Base class for all dialog elements with a textual label on the left.
+			 * @constructor
+			 * @example
+			 * @extends CKEDITOR.ui.dialog.uiElement
+			 * @param {CKEDITOR.dialog} dialog
+			 * Parent dialog object.
+			 * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition
+			 * The element definition. Accepted fields:
+			 * <ul>
+			 * 	<li><strong>label</strong> (Required) The label string.</li>
+			 * 	<li><strong>labelLayout</strong> (Optional) Put 'horizontal' here if the
+			 * 	label element is to be layed out horizontally. Otherwise a vertical
+			 * 	layout will be used.</li>
+			 * 	<li><strong>widths</strong> (Optional) This applies only for horizontal
+			 * 	layouts - an 2-element array of lengths to specify the widths of the
+			 * 	label and the content element.</li>
+			 * </ul>
+			 * @param {Array} htmlList
+			 * List of HTML code to output to.
+			 * @param {Function} contentHtml
+			 * A function returning the HTML code string to be added inside the content
+			 * cell.
+			 */
+			labeledElement : function( dialog, elementDefinition, htmlList, contentHtml )
+			{
+				if ( arguments.length < 4 )
+					return;
+
+				var _ = initPrivateObject.call( this, elementDefinition );
+				_.labelId = CKEDITOR.tools.getNextNumber() + '_label';
+				var children = this._.children = [];
+				/** @ignore */
+				var innerHTML = function()
+				{
+					var html = [];
+					if ( elementDefinition.labelLayout != 'horizontal' )
+						html.push( '<div class="cke_dialog_ui_labeled_label" id="',
+								_.labelId,
+								'" >',
+								CKEDITOR.tools.htmlEncode( elementDefinition.label ),
+								'</div>',
+								'<div class="cke_dialog_ui_labeled_content">',
+								contentHtml( dialog, elementDefinition ),
+								'</div>' );
+					else
+					{
+						var hboxDefinition = {
+							type : 'hbox',
+							widths : elementDefinition.widths,
+							padding : 0,
+							children :
+							[
+								{
+									type : 'html',
+									html : '<span class="cke_dialog_ui_labeled_label" ' +
+										'id="' + _.labelId + '">' +  CKEDITOR.tools.htmlEncode( elementDefinition.label ) +
+										'</span>'
+								},
+								{
+									type : 'html',
+									html : '<span class="cke_dialog_ui_labeled_content">' +
+										contentHtml( dialog, elementDefinition ) +
+										'</span>'
+								}
+							]
+						};
+						CKEDITOR.dialog._.uiElementBuilders.hbox.build( dialog, hboxDefinition, html );
+					}
+					return html.join( '' );
+				};
+				CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition, htmlList, 'div', null, null, innerHTML );
+			},
+
+			/**
+			 * A text input with a label. This UI element class represents both the
+			 * single-line text inputs and password inputs in dialog boxes.
+			 * @constructor
+			 * @example
+			 * @extends CKEDITOR.ui.dialog.labeledElement
+			 * @param {CKEDITOR.dialog} dialog
+			 * Parent dialog object.
+			 * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition
+			 * The element definition. Accepted fields:
+			 * <ul>
+			 * 	<li><strong>default</strong> (Optional) The default value.</li>
+			 * 	<li><strong>validate</strong> (Optional) The validation function. </li>
+			 * 	<li><strong>maxLength</strong> (Optional) The maximum length of text box
+			 * 	contents.</li>
+			 * 	<li><strong>size</strong> (Optional) The size of the text box. This is
+			 * 	usually overridden by the size defined by the skin, however.</li>
+			 * </ul>
+			 * @param {Array} htmlList
+			 * List of HTML code to output to.
+			 */
+			textInput : function( dialog, elementDefinition, htmlList )
+			{
+				if ( arguments.length < 3 )
+					return;
+
+				initPrivateObject.call( this, elementDefinition );
+				var domId = this._.inputId = CKEDITOR.tools.getNextNumber() + '_textInput',
+					attributes = { 'class' : 'cke_dialog_ui_input_' + elementDefinition.type, id : domId },
+					i;
+
+				// Set the validator, if any.
+				if ( elementDefinition.validate )
+					this.validate = elementDefinition.validate;
+
+				// Set the max length and size.
+				if ( elementDefinition.maxLength )
+					attributes.maxlength = elementDefinition.maxLength;
+				if ( elementDefinition.size )
+					attributes.size = elementDefinition.size;
+
+				// If user presses Enter in a text box, it implies clicking OK for the dialog.
+				var me = this;
+				dialog.on( 'load', function()
+					{
+						me.getInputElement().on( 'keyup', function( evt )
+							{
+								if ( evt.data.$.keyCode == 13 )
+									dialog.getButton( 'ok' ) && dialog.getButton( 'ok' ).click();
+							} );
+					} );
+
+				/** @ignore */
+				var innerHTML = function()
+				{
+					// IE BUG: Text input fields in IE at 100% would exceed a <td> or inline
+					// container's width, so need to wrap it inside a <div>.
+					var html = [ '<div class="cke_dialog_ui_input_', elementDefinition.type, '"><input ' ];
+					for ( var i in attributes )
+						html.push( i + '="' + attributes[i] + '" ' );
+					html.push( ' /></div>' );
+					return html.join( '' );
+				};
+				CKEDITOR.ui.dialog.labeledElement.call( this, dialog, elementDefinition, htmlList, innerHTML );
+			},
+
+			/**
+			 * A text area with a label on the top or left.
+			 * @constructor
+			 * @extends CKEDITOR.ui.dialog.labeledElement
+			 * @example
+			 * @param {CKEDITOR.dialog} dialog
+			 * Parent dialog object.
+			 * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition
+			 * The element definition. Accepted fields:
+			 * <ul>
+			 * 	<li><strong>rows</strong> (Optional) The number of rows displayed.
+			 * 	Defaults to 5 if not defined.</li>
+			 * 	<li><strong>cols</strong> (Optional) The number of cols displayed.
+			 * 	Defaults to 20 if not defined. Usually overridden by skins.</li>
+			 * 	<li><strong>default</strong> (Optional) The default value.</li>
+			 * 	<li><strong>validate</strong> (Optional) The validation function. </li>
+			 * </ul>
+			 * @param {Array} htmlList
+			 * List of HTML code to output to.
+			 */
+			textarea : function( dialog, elementDefinition, htmlList )
+			{
+				if ( arguments.length < 3 )
+					return;
+
+				initPrivateObject.call( this, elementDefinition );
+				var me = this,
+					domId = this._.inputId = CKEDITOR.tools.getNextNumber() + '_textarea',
+					attributes = {};
+
+				if ( elementDefinition.validate )
+					this.validate = elementDefinition.validate;
+
+				// Generates the essential attributes for the textarea tag.
+				attributes.rows = elementDefinition.rows || 5;
+				attributes.cols = elementDefinition.cols || 20;
+
+				/** @ignore */
+				var innerHTML = function()
+				{
+					var html = [ '<div class="cke_dialog_ui_input_textarea"><textarea class="cke_dialog_ui_input_textarea" id="', domId, '" ' ];
+					for ( var i in attributes )
+						html.push( i + '="' + CKEDITOR.tools.htmlEncode( attributes[i] ) + '" ' );
+					html.push( '>', CKEDITOR.tools.htmlEncode( me.getDefault() ), '</textarea></div>' );
+					return html.join( '' );
+				}
+				CKEDITOR.ui.dialog.labeledElement.call( this, dialog, elementDefinition, htmlList, innerHTML );
+			},
+
+			/**
+			 * A single checkbox with a label on the right.
+			 * @constructor
+			 * @extends CKEDITOR.ui.dialog.uiElement
+			 * @example
+			 * @param {CKEDITOR.dialog} dialog
+			 * Parent dialog object.
+			 * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition
+			 * The element definition. Accepted fields:
+			 * <ul>
+			 * 	<li><strong>checked</strong> (Optional) Whether the checkbox is checked
+			 * 	on instantiation. Defaults to false.</li>
+			 * 	<li><strong>validate</strong> (Optional) The validation function.</li>
+			 * 	<li><strong>label</strong> (Optional) The checkbox label.</li>
+			 * </ul>
+			 * @param {Array} htmlList
+			 * List of HTML code to output to.
+			 */
+			checkbox : function( dialog, elementDefinition, htmlList )
+			{
+				if ( arguments.length < 3)
+					return;
+
+				var _ = initPrivateObject.call( this, elementDefinition, { 'default' : [ elementDefinition.checked || false ] }  );
+
+				if ( elementDefinition.validate )
+					this.validate = elementDefinition.validate;
+
+				/** @ignore */
+				var innerHTML = function()
+				{
+					var myDefinition = CKEDITOR.tools.extend( {}, elementDefinition,
+							{
+								id : elementDefinition.id ? elementDefinition.id + '_checkbox' : CKEDITOR.tools.getNextNumber() + '_checkbox'
+							}, true ),
+						html = [],
+						attributes = { 'class' : 'cke_dialog_ui_checkbox_input', type : 'checkbox' };
+					cleanInnerDefinition( myDefinition );
+					if ( elementDefinition.checked )
+						attributes.checked = 'checked';
+					_.checkbox = new CKEDITOR.ui.dialog.uiElement( dialog, myDefinition, html, 'input', null, attributes );
+					html.push( ' ', CKEDITOR.tools.htmlEncode( elementDefinition.label ) );
+					return html.join( '' );
+				};
+
+				CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition, htmlList, 'label', null, null, innerHTML );
+			},
+
+			/**
+			 * A group of radio buttons.
+			 * @constructor
+			 * @example
+			 * @extends CKEDITOR.ui.dialog.labeledElement
+			 * @param {CKEDITOR.dialog} dialog
+			 * Parent dialog object.
+			 * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition
+			 * The element definition. Accepted fields:
+			 * <ul>
+			 * 	<li><strong>default</strong> (Required) The default value.</li>
+			 * 	<li><strong>validate</strong> (Optional) The validation function.</li>
+			 * 	<li><strong>items</strong> (Required) 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.</li>
+			 * </ul>
+			 * @param {Array} htmlList
+			 * List of HTML code to output to.
+			 */
+			radio : function( dialog, elementDefinition, htmlList )
+			{
+				if ( arguments.length < 3)
+					return;
+
+				initPrivateObject.call( this, elementDefinition );
+				if ( this.getDefault() == '' )
+					this._['default'] = [ elementDefinition.items[0][1] ] ;
+				if ( elementDefinition.validate )
+					this.validate = elementDefinition.valdiate;
+				var children = [], me = this;
+
+				/** @ignore */
+				var innerHTML = function()
+				{
+					var inputHtmlList = [], html = [],
+						commonAttributes = { 'class' : 'cke_dialog_ui_radio_item' },
+						commonName = elementDefinition.id ? elementDefinition.id + '_radio' : CKEDITOR.tools.getNextNumber() + '_radio';
+					for ( var i = 0 ; i < elementDefinition.items.length ; i++ )
+					{
+						var item = elementDefinition.items[i],
+							title = item[2] !== undefined ? item[2] : item[0],
+							value = item[1] !== undefined ? item[1] : item[0],
+							inputDefinition = CKEDITOR.tools.extend( {}, elementDefinition,
+									{
+										id : CKEDITOR.tools.getNextNumber() + '_radio_input',
+										title : null,
+										type : null
+									}, true ),
+							labelDefinition = CKEDITOR.tools.extend( {}, inputDefinition,
+									{
+										id : null,
+										title : title
+									}, true ),
+							inputHtml = [],
+							inputAttributes =
+							{
+								type : 'radio',
+								'class' : 'cke_dialog_ui_radio_input',
+								name : commonName,
+								value : value
+							};
+						if ( me.getDefault() == value )
+							inputAttributes.checked = 'checked';
+						cleanInnerDefinition( inputDefinition );
+						cleanInnerDefinition( labelDefinition );
+						children.push( new CKEDITOR.ui.dialog.uiElement( dialog, inputDefinition, inputHtml, 'input', null, inputAttributes ) );
+						new CKEDITOR.ui.dialog.uiElement( dialog, labelDefinition, inputHtmlList, 'label', null, null,
+							   inputHtml.join( '' ) + ' ' + item[0] );
+					}
+					new CKEDITOR.ui.dialog.hbox( dialog, [], inputHtmlList, html );
+					return html.join( '' );
+				};
+
+				CKEDITOR.ui.dialog.labeledElement.call( this, dialog, elementDefinition, htmlList, innerHTML );
+				this._.children = children;
+			},
+
+			/**
+			 * A button with a label inside.
+			 * @constructor
+			 * @example
+			 * @extends CKEDITOR.ui.dialog.uiElement
+			 * @param {CKEDITOR.dialog} dialog
+			 * Parent dialog object.
+			 * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition
+			 * The element definition. Accepted fields:
+			 * <ul>
+			 * 	<li><strong>label</strong> (Required) The button label.</li>
+			 * 	<li><strong>disabled</strong> (Optional) Set to true if you want the
+			 * 	button to appear in disabled state.</li>
+			 * </ul>
+			 * @param {Array} htmlList
+			 * List of HTML code to output to.
+			 */
+			button : function( dialog, elementDefinition, htmlList )
+			{
+				if ( arguments.length < 3)
+					return;
+
+				if ( typeof( elementDefinition ) == 'function' )
+					elementDefinition = elementDefinition( dialog.getParentEditor() );
+				initPrivateObject.call( this, elementDefinition, { disabled : elementDefinition.disabled || false } );
+
+				/** @ignore */
+				var innerHTML = function()
+				{
+					return [ '<tbody><tr><td class="cke_dialog_ui_button_txt">',
+						   CKEDITOR.tools.htmlEncode( elementDefinition.label ),
+						   '</td></tr></tbody>' ].join( '' );
+				};
+
+				// Add OnClick event to this input.
+				CKEDITOR.event.implementOn( this );
+
+				// Register an event handler for processing button clicks.
+				var me = this;
+				dialog.on( 'load', function( eventInfo )
+						{
+							var element = this.getElement();
+							element.on( 'mousedown', function( evt )
+								{
+									// If button is disabled, don't do anything.
+									if ( me._.disabled )
+										return;
+
+									// Change styles to indicate the button is being clicked.
+									me.getElement().addClass( 'active' );
+
+									// Store the currently active button.
+									CKEDITOR.ui.dialog.button._.activeButton = [ me, me.getElement() ];
+								});
+
+							// IE BUG: Padding attributes are ignored for <td> cells.
+							if ( CKEDITOR.env.ie )
+								element.getChild( [0, 0, 0] ).$.innerHTML += '';
+
+							if ( !eventInfo.data.buttonHandlerRegistered )
+							{
+								CKEDITOR.document.on( 'mouseup', function( evt )
+									{
+										var target = evt.data.getTarget(),
+											activeButton = CKEDITOR.ui.dialog.button._.activeButton;
+
+										// If there's no active button, bail out.
+										if ( !activeButton )
+											return;
+
+										// Change styles to remove active status.
+										activeButton[1].removeClass( 'active' );
+
+										// Fire the click event - but only if the
+										// active button is the same as target.
+										if ( activeButton[1].equals( target.getAscendant( 'table' ) ) )
+											activeButton[0].fire( 'click', { dialog : activeButton[0].getDialog() } );
+
+										// Clear active button flag.
+										CKEDITOR.ui.dialog.button._.activeButton = null;
+									});
+
+								eventInfo.data.buttonHandlerRegistered = true;
+							}
+
+							this.getElement().unselectable();
+						}, this );
+
+				var styles = {},
+					align = elementDefinition.align || ( dialog.getParentEditor().lang.dir == 'ltr' ? 'left' : 'right' );
+
+				// IE6 & 7 BUG: Need to set margin as well as align.
+				if ( CKEDITOR.env.ie && CKEDITOR.env.version < 8 )
+				{
+					styles.margin = [
+						'auto',
+						align == 'right' ? '0px' : 'auto',
+						'auto',
+						align == 'left' ? '0px' : 'auto' ].join( ' ' );
+				}
+
+				CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition, htmlList, 'table', styles,
+						{ align : align }, innerHTML );
+			},
+
+			/**
+			 * A select box.
+			 * @extends CKEDITOR.ui.dialog.uiElement
+			 * @example
+			 * @constructor
+			 * @param {CKEDITOR.dialog} dialog
+			 * Parent dialog object.
+			 * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition
+			 * The element definition. Accepted fields:
+			 * <ul>
+			 * 	<li><strong>default</strong> (Required) The default value.</li>
+			 * 	<li><strong>validate</strong> (Optional) The validation function.</li>
+			 * 	<li><strong>items</strong> (Required) 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.</li>
+			 * 	<li><strong>multiple</strong> (Optional) Set this to true if you'd like
+			 * 	to have a multiple-choice select box.</li>
+			 * 	<li><strong>size</strong> (Optional) The number of items to display in
+			 * 	the select box.</li>
+			 * </ul>
+			 * @param {Array} htmlList
+			 * List of HTML code to output to.
+			 */
+			select : function( dialog, elementDefinition, htmlList )
+			{
+				if ( arguments.length < 3 )
+					return;
+
+				var _ = initPrivateObject.call( this, elementDefinition );
+
+				if ( elementDefinition.validate )
+					this.validate = elementDefinition.validate;
+
+				/** @ignore */
+				var innerHTML = function()
+				{
+					var myDefinition = CKEDITOR.tools.extend( {}, elementDefinition,
+							{
+								id : elementDefinition.id ? elementDefinition.id + '_select' : CKEDITOR.tools.getNextNumber() + '_select'
+							}, true ),
+						html = [],
+						innerHTML = [],
+						attributes = { 'class' : 'cke_dialog_ui_input_select' };
+
+					// Add multiple and size attributes from element definition.
+					if ( elementDefinition.size != undefined )
+						attributes.size = elementDefinition.size;
+					if ( elementDefinition.multiple != undefined )
+						attributes.multiple = elementDefinition.multiple;
+
+					cleanInnerDefinition( myDefinition );
+					for ( var i = 0, item ; i < elementDefinition.items.length && ( item = elementDefinition.items[i] ) ; i++ )
+					{
+						innerHTML.push( '<option value="',
+							CKEDITOR.tools.htmlEncode( item[1] !== undefined ? item[1] : item[0] ), '" /> ',
+							CKEDITOR.tools.htmlEncode( item[0] ) );
+					};
+
+					_.select = new CKEDITOR.ui.dialog.uiElement( dialog, myDefinition, html, 'select', null, attributes, innerHTML.join( '' ) );
+					return html.join( '' );
+				};
+
+				CKEDITOR.ui.dialog.labeledElement.call( this, dialog, elementDefinition, htmlList, innerHTML );
+			},
+
+			/**
+			 * A file upload input.
+			 * @extends CKEDITOR.ui.dialog.labeledElement
+			 * @example
+			 * @constructor
+			 * @param {CKEDITOR.dialog} dialog
+			 * Parent dialog object.
+			 * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition
+			 * The element definition. Accepted fields:
+			 * <ul>
+			 * 	<li><strong>validate</strong> (Optional) The validation function.</li>
+			 * </ul>
+			 * @param {Array} htmlList
+			 * List of HTML code to output to.
+			 */
+			file : function( dialog, elementDefinition, htmlList )
+			{
+				if ( arguments.length < 3 )
+					return;
+
+				if ( elementDefinition['default'] === undefined )
+					elementDefinition['default'] = '';
+
+				var _ = CKEDITOR.tools.extend( initPrivateObject.call( this, elementDefinition ), { definition : elementDefinition, buttons : [] } );
+
+				if ( elementDefinition.validate )
+					this.validate = elementDefinition.validate;
+
+				/** @ignore */
+				var innerHTML = function()
+				{
+					_.frameId = CKEDITOR.tools.getNextNumber() + '_fileInput';
+					var html = [ '<iframe frameborder="0" allowtransparency="0" class="cke_dialog_ui_input_file" id="',
+						_.frameId, '" src="javascript: void(0)" ></iframe>' ];
+					return html.join( '' );
+				};
+
+				// IE BUG: Parent container does not resize to contain the iframe automatically.
+				dialog.on( 'load', function()
+					{
+						var iframe = CKEDITOR.document.getById( _.frameId ),
+							contentDiv = iframe.getParent();
+						contentDiv.addClass( 'cke_dialog_ui_input_file' );
+					} );
+
+				CKEDITOR.ui.dialog.labeledElement.call( this, dialog, elementDefinition, htmlList, innerHTML );
+			},
+
+			/**
+			 * A button for submitting the file in a file upload input.
+			 * @extends CKEDITOR.ui.dialog.button
+			 * @example
+			 * @constructor
+			 * @param {CKEDITOR.dialog} dialog
+			 * Parent dialog object.
+			 * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition
+			 * The element definition. Accepted fields:
+			 * <ul>
+			 * 	<li><strong>for</strong> (Required) The file input's page and element Id
+			 * 	to associate to, in a 2-item array format: [ 'page_id', 'element_id' ].
+			 * 	</li>
+			 * 	<li><strong>validate</strong> (Optional) The validation function.</li>
+			 * </ul>
+			 * @param {Array} htmlList
+			 * List of HTML code to output to.
+			 */
+			fileButton : function( dialog, elementDefinition, htmlList )
+			{
+				if ( arguments.length < 3 )
+					return;
+
+				var _ = initPrivateObject.call( this, elementDefinition ),
+					me = this;
+
+				if ( elementDefinition.validate )
+					this.validate = elementDefinition.validate;
+
+				var myDefinition = CKEDITOR.tools.extend( {}, elementDefinition );
+				myDefinition.className = ( myDefinition.className ? myDefinition.className + ' ' : '' ) + 'cke_dialog_ui_button';
+				myDefinition.onClick = function( evt )
+				{
+					var target = elementDefinition[ 'for' ];		// [ pageId, elementId ]
+					dialog.getContentElement( target[0], target[1] ).submit();
+					this.disable();
+				};
+
+				dialog.on( 'load', function()
+						{
+							dialog.getContentElement( elementDefinition[ 'for' ][0], elementDefinition[ 'for' ][1] )._.buttons.push( me );
+						} );
+
+				CKEDITOR.ui.dialog.button.call( this, dialog, myDefinition, htmlList );
+			},
+
+			html : (function()
+			{
+				var myHtmlRe = /^\s*<[\w:]+\s+([^>]*)?>/,
+					theirHtmlRe = /^(\s*<[\w:]+(?:\s+[^>]*)?)((?:.|\r|\n)+)$/,
+					emptyTagRe = /\/$/;
+				/**
+				 * A dialog element made from raw HTML code.
+				 * @extends CKEDITOR.ui.dialog.uiElement
+				 * @name CKEDITOR.ui.dialog.html
+				 * @param {CKEDITOR.dialog} dialog Parent dialog object.
+				 * @param {CKEDITOR.dialog.uiElementDefinition} elementDefinition Element definition.
+				 * Accepted fields:
+				 * <ul>
+				 * 	<li><strong>html</strong> (Required) HTML code of this element.</li>
+				 * </ul>
+				 * @param {Array} htmlList List of HTML code to be added to the dialog's content area.
+				 * @example
+				 * @constructor
+				 */
+				return function( dialog, elementDefinition, htmlList )
+				{
+					if ( arguments.length < 3 )
+						return;
+
+					var myHtmlList = [],
+						myHtml,
+						theirHtml = elementDefinition.html,
+						myMatch, theirMatch;
+
+					// If the HTML input doesn't contain any tags at the beginning, add a <span> tag around it.
+					if ( theirHtml.charAt( 0 ) != '<' )
+						theirHtml = '<span>' + theirHtml + '</span>';
+
+					CKEDITOR.ui.dialog.uiElement.call( this, dialog, elementDefinition, myHtmlList, 'span', null, null, '' );
+
+					// Append the attributes created by the uiElement call to the real HTML.
+					myHtml = myHtmlList.join( '' );
+					myMatch = myHtml.match( myHtmlRe );
+					theirMatch = theirHtml.match( theirHtmlRe ) || [ '', '', '' ];
+
+					if ( emptyTagRe.test( theirMatch[1] ) )
+					{
+						theirMatch[1] = theirMatch[1].slice( 0, -1 );
+						theirMatch[2] = '/' + theirMatch[2];
+					}
+
+					htmlList.push( [ theirMatch[1], ' ', myMatch[1] || '', theirMatch[2] ].join( '' ) );
+				}
+			})()
+		}, true );
+
+	CKEDITOR.ui.dialog.html.prototype = new CKEDITOR.ui.dialog.uiElement;
+
+	CKEDITOR.ui.dialog.labeledElement.prototype = CKEDITOR.tools.extend( new CKEDITOR.ui.dialog.uiElement,
+			/** @lends CKEDITOR.ui.dialog.labeledElement.prototype */
+			{
+				/**
+				 * Sets the label text of the element.
+				 * @param {String} label The new label text.
+				 * @returns {CKEDITOR.ui.dialog.labeledElement} The current labeled element.
+				 * @example
+				 */
+				setLabel : function( label )
+				{
+					var node = CKEDITOR.document.getById( this._.labelId );
+					if ( node.getChildCount() < 1 )
+						( new CKEDITOR.dom.text( label, CKEDITOR.document ) ).appendTo( node );
+					else
+						node.getChild( 0 ).$.nodeValue = label;
+					return this;
+				},
+
+				/**
+				 * Retrieves the current label text of the elment.
+				 * @returns {String} The current label text.
+				 * @example
+				 */
+				getLabel : function()
+				{
+					var node = CKEDITOR.document.getById( this._.labelId );
+					if ( !node || node.getChildCount() < 1 )
+						return '';
+					else
+						return node.getChild( 0 ).getText();
+				},
+
+				/**
+				 * Defines the onChange event for UI element definitions.
+				 * @field
+				 * @type Object
+				 * @example
+				 */
+				eventProcessors : commonEventProcessors
+			}, true );
+
+	CKEDITOR.ui.dialog.button.prototype = CKEDITOR.tools.extend( new CKEDITOR.ui.dialog.uiElement,
+			/** @lends CKEDITOR.ui.dialog.button.prototype */
+			{
+				/**
+				 * Simulates a click to the button.
+				 * @example
+				 * @returns {Object} Return value of the 'click' event.
+				 */
+				click : function()
+				{
+					if ( !this._.disabled )
+						return this.fire( 'click', { dialog : this._.dialog } );
+				},
+
+				/**
+				 * Enables the button.
+				 * @example
+				 */
+				enable : function()
+				{
+					this._.disabled = false;
+					this.getElement().removeClass( 'disabled' );
+				},
+
+				/**
+				 * Disables the button.
+				 * @example
+				 */
+				disable : function()
+				{
+					this._.disabled = true;
+					this.getElement().addClass( 'disabled' );
+				},
+
+				/**
+				 * Defines the onChange event and onClick for button element definitions.
+				 * @field
+				 * @type Object
+				 * @example
+				 */
+				eventProcessors : CKEDITOR.tools.extend( {}, CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,
+					{
+						/** @ignore */
+						onClick : function( dialog, func )
+						{
+							this.on( 'click', func );
+						}
+					}, true ),
+
+				/**
+				 * Handler for the element's access key up event. Simulates a click to
+				 * the button.
+				 * @example
+				 */
+				accessKeyUp : function()
+				{
+					this.getElement().removeClass( 'active' );
+					this.click();
+				},
+
+				/**
+				 * Handler for the element's access key down event. Simulates a mouse
+				 * down to the button.
+				 * @example
+				 */
+				accessKeyDown : function()
+				{
+					this.getElement().addClass( 'active' );
+				}
+			}, true );
+
+	CKEDITOR.ui.dialog.textInput.prototype = CKEDITOR.tools.extend( new CKEDITOR.ui.dialog.labeledElement,
+			/** @lends CKEDITOR.ui.dialog.textInput.prototype */
+			{
+				/**
+				 * Gets the text input DOM element under this UI object.
+				 * @example
+				 * @returns {CKEDITOR.dom.element} The DOM element of the text input.
+				 */
+				getInputElement : function()
+				{
+					return CKEDITOR.document.getById( this._.inputId );
+				},
+
+				/**
+				 * Puts focus into the text input.
+				 * @example
+				 */
+				focus : function()
+				{
+					var me = this.selectParentTab();
+
+					// GECKO BUG: setTimeout() is needed to workaround invisible selections.
+					setTimeout( function(){ me.getInputElement().$.focus(); }, 0 );
+				},
+
+				/**
+				 * Selects all the text in the text input.
+				 * @example
+				 */
+				select : function()
+				{
+					var me = this.selectParentTab();
+
+					// GECKO BUG: setTimeout() is needed to workaround invisible selections.
+					setTimeout( function(){ var e = me.getInputElement().$; e.focus(); e.select(); }, 0 );
+				},
+
+				/**
+				 * Handler for the text input's access key up event. Makes a select()
+				 * call to the text input.
+				 * @example
+				 */
+				accessKeyUp : function()
+				{
+					this.select();
+				}
+			}, commonPrototype, true );
+
+	CKEDITOR.ui.dialog.textarea.prototype = new CKEDITOR.ui.dialog.textInput();
+
+	CKEDITOR.ui.dialog.select.prototype = CKEDITOR.tools.extend( new CKEDITOR.ui.dialog.labeledElement,
+			/** @lends CKEDITOR.ui.dialog.select.prototype */
+			{
+				/**
+				 * Gets the DOM element of the select box.
+				 * @returns {CKEDITOR.dom.element} The &lt;select&gt; element of this UI
+				 * element.
+				 * @example
+				 */
+				getInputElement : function()
+				{
+					return this._.select.getElement();
+				},
+
+				/**
+				 * Adds an option to the select box.
+				 * @param {String} label Option label.
+				 * @param {String} value (Optional) Option value, if not defined it'll be
+				 * assumed to be the same as the label.
+				 * @param {Number} index (Optional) Position of the option to be inserted
+				 * to. If not defined the new option will be inserted to the end of list.
+				 * @example
+				 * @returns {CKEDITOR.ui.dialog.select} The current select UI element.
+				 */
+				add : function( label, value, index )
+				{
+					var option = new CKEDITOR.dom.element( 'option', this.getDialog().getParentEditor().document ),
+						selectElement = this.getInputElement().$;
+					option.$.text = label;
+					option.$.value = ( value === undefined || value === null ) ? label : value;
+					if ( index === undefined || index === null )
+					{
+						if ( CKEDITOR.env.ie )
+							selectElement.add( option.$ );
+						else
+							selectElement.add( option.$, null );
+					}
+					else
+						selectElement.add( option.$, index );
+					return this;
+				},
+
+				/**
+				 * Removes an option from the selection list.
+				 * @param {Number} index Index of the option to be removed.
+				 * @example
+				 * @returns {CKEDITOR.ui.dialog.select} The current select UI element.
+				 */
+				remove : function( index )
+				{
+					var selectElement = this.getInputElement().$;
+					selectElement.remove( index );
+					return this;
+				},
+
+				/**
+				 * Clears all options out of the selection list.
+				 * @returns {CKEDITOR.ui.dialog.select} The current select UI element.
+				 */
+				clear : function()
+				{
+					var selectElement = this.getInputElement().$;
+					while ( selectElement.length > 0 )
+						selectElement.remove( 0 );
+					return this;
+				}
+			}, commonPrototype, true );
+
+	CKEDITOR.ui.dialog.checkbox.prototype = CKEDITOR.tools.extend( new CKEDITOR.ui.dialog.uiElement,
+			/** @lends CKEDITOR.ui.dialog.checkbox.prototype */
+			{
+				/**
+				 * Gets the checkbox DOM element.
+				 * @example
+				 * @returns {CKEDITOR.dom.element} The DOM element of the checkbox.
+				 */
+				getInputElement : function()
+				{
+					return this._.checkbox.getElement();
+				},
+
+				/**
+				 * Sets the state of the checkbox.
+				 * @example
+				 * @param {Boolean} true to tick the checkbox, false to untick it.
+				 */
+				setValue : function( checked )
+				{
+					this.getInputElement().$.checked = checked;
+					this.fire( 'change', { value : checked } );
+				},
+
+				/**
+				 * Gets the state of the checkbox.
+				 * @example
+				 * @returns {Boolean} true means the checkbox is ticked, false means it's not ticked.
+				 */
+				getValue : function()
+				{
+					return this.getInputElement().$.checked;
+				},
+
+				/**
+				 * Handler for the access key up event. Toggles the checkbox.
+				 * @example
+				 */
+				accessKeyUp : function()
+				{
+					this.setValue( !this.getValue() );
+				},
+
+				/**
+				 * Defines the onChange event for UI element definitions.
+				 * @field
+				 * @type Object
+				 * @example
+				 */
+				eventProcessors :
+				{
+					onChange : function( dialog, func )
+					{
+						if ( !CKEDITOR.env.ie )
+							return commonEventProcessors.onChange.apply( this, arguments );
+						else
+						{
+							dialog.on( 'load', function()
+								{
+									var element = this._.checkbox.getElement();
+									element.on( 'propertychange', function( evt )
+										{
+											evt = evt.data.$;
+											if ( evt.propertyName != 'checked' )
+												return;
+											this.fire( 'change', { value : element.$.checked } );
+										}, this );
+								}, this );
+							this.on( 'change', func );
+						}
+					}
+				}
+			}, commonPrototype, true );
+
+	CKEDITOR.ui.dialog.radio.prototype = CKEDITOR.tools.extend( new CKEDITOR.ui.dialog.uiElement,
+			/** @lends CKEDITOR.ui.dialog.radio.prototype */
+			{
+				/**
+				 * Checks one of the radio buttons in this button group.
+				 * @example
+				 * @param {String} value The value of the button to be chcked.
+				 */
+				setValue : function( value )
+				{
+					var children = this._.children,
+						item;
+					for ( var i = 0 ; ( i < children.length ) && ( item = children[i] ) ; i++ )
+						item.getElement().$.checked = ( item.getValue() == value );
+					this.fire( 'change', { value : value } );
+				},
+
+				/**
+				 * Gets the value of the currently checked radio button.
+				 * @example
+				 * @returns {String} The currently checked button's value.
+				 */
+				getValue : function()
+				{
+					var children = this._.children;
+					for ( var i = 0 ; i < children.length ; i++ )
+					{
+						if ( children[i].getElement().$.checked )
+							return children[i].getValue();
+					}
+					return null;
+				},
+
+				/**
+				 * Handler for the access key up event. Focuses the currently
+				 * selected radio button, or the first radio button if none is
+				 * selected.
+				 * @example
+				 */
+				accessKeyUp : function()
+				{
+					var children = this._.children, i;
+					for ( i = 0 ; i < children.length ; i++ )
+					{
+						if ( children[i].getElement().$.checked )
+						{
+							children[i].getElement().focus();
+							return;
+						}
+					}
+					children[0].getElement().focus();
+				},
+
+				/**
+				 * Defines the onChange event for UI element definitions.
+				 * @field
+				 * @type Object
+				 * @example
+				 */
+				eventProcessors :
+				{
+					onChange : function( dialog, func )
+					{
+						if ( !CKEDITOR.env.ie )
+							return commonEventProcessors.onChange.apply( this, arguments );
+						else
+						{
+							dialog.on( 'load', function()
+								{
+									var children = this._.children, me = this;
+									for ( var i = 0 ; i < children.length ; i++ )
+									{
+										var element = children[i].getElement();
+										element.on( 'propertychange', function( evt )
+											{
+												evt = evt.data.$;
+												if ( evt.propertyName != 'checked' || !this.$.checked )
+													return;
+												me.fire( 'change', { value : this.getAttribute( 'value' ) } );
+											} );
+									}
+								}, this );
+							this.on( 'change', func );
+						}
+					}
+				}
+			}, commonPrototype, true );
+
+	CKEDITOR.ui.dialog.file.prototype = CKEDITOR.tools.extend( new CKEDITOR.ui.dialog.labeledElement,
+			commonPrototype,
+			/** @lends CKEDITOR.ui.dialog.file.prototype */
+			{
+				/**
+				 * Gets the &lt;input&gt; element of this file input.
+				 * @returns {CKEDITOR.dom.element} The file input element.
+				 * @example
+				 */
+				getInputElement : function()
+				{
+					return new CKEDITOR.dom.element( CKEDITOR.document.getById( this._.frameId )
+						.$.contentWindow.document.forms[0].elements[0] );
+				},
+
+				/**
+				 * Uploads the file in the file input.
+				 * @returns {CKEDITOR.ui.dialog.file} This object.
+				 * @example
+				 */
+				submit : function()
+				{
+					this.getInputElement().getParent().$.submit();
+					return this;
+				},
+
+				/**
+				 * Redraws the file input and resets the file path in the file input.
+				 * The redraw logic is necessary because non-IE browsers tend to clear
+				 * the &lt;iframe&gt; containing the file input after closing the dialog.
+				 * @example
+				 */
+				reset : function()
+				{
+					var frameElement = CKEDITOR.document.getById( this._.frameId ),
+						frameDocument = frameElement.$.contentWindow.document,
+						elementDefinition = this._.definition,
+						buttons = this._.buttons;
+					frameDocument.open();
+					frameDocument.write( [ '<html><head><title></title></head><body style="margin: 0; overflow: hidden; background: transparent;">',
+							'<form enctype="multipart/form-data" method="POST" action="',
+							CKEDITOR.tools.htmlEncode( elementDefinition.action ),
+							'">',
+							'<input type="file" name="',
+							CKEDITOR.tools.htmlEncode( elementDefinition.id || 'cke_upload' ),
+							'" size="',
+							CKEDITOR.tools.htmlEncode( elementDefinition.size || '' ),
+							'" />',
+							'</form>',
+							'</body></html>' ].join( '' ) );
+					frameDocument.close();
+
+					for ( var i = 0 ; i < buttons.length ; i++ )
+						buttons[i].enable();
+				},
+
+				/**
+				 * Defines the onChange event for UI element definitions.
+				 * @field
+				 * @type Object
+				 * @example
+				 */
+				eventProcessors : commonEventProcessors
+			}, true );
+
+	CKEDITOR.ui.dialog.fileButton.prototype = new CKEDITOR.ui.dialog.button;
+
+	CKEDITOR.ui.dialog.button._ = { activeButton : null };
+
+	CKEDITOR.dialog.addUIElement( 'text', textBuilder );
+	CKEDITOR.dialog.addUIElement( 'password', textBuilder );
+	CKEDITOR.dialog.addUIElement( 'textarea', commonBuilder );
+	CKEDITOR.dialog.addUIElement( 'checkbox', commonBuilder );
+	CKEDITOR.dialog.addUIElement( 'radio', commonBuilder );
+	CKEDITOR.dialog.addUIElement( 'button', commonBuilder );
+	CKEDITOR.dialog.addUIElement( 'select', commonBuilder );
+	CKEDITOR.dialog.addUIElement( 'file', commonBuilder );
+	CKEDITOR.dialog.addUIElement( 'fileButton', commonBuilder );
+	CKEDITOR.dialog.addUIElement( 'html', commonBuilder );
+})();
Index: /CKEditor/trunk/_source/plugins/horizontalrule/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/horizontalrule/plugin.js	(revision 2997)
+++ /CKEditor/trunk/_source/plugins/horizontalrule/plugin.js	(revision 2997)
@@ -0,0 +1,35 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @file Horizontal Rule plugin.
+ */
+
+(function()
+{
+	var horizontalruleCmd =
+	{
+		exec : function( editor )
+		{
+			editor.insertElement( editor.document.createElement( 'hr' ) );
+		}
+	};
+	
+	var pluginName = 'horizontalrule';
+
+	// Register a plugin named "horizontalrule".
+	CKEDITOR.plugins.add( pluginName,
+	{
+		init : function( editor, pluginPath )
+		{
+			editor.addCommand( pluginName, horizontalruleCmd );
+			editor.ui.addButton( 'HorizontalRule',
+				{
+					label : editor.lang.horizontalrule,
+					command : pluginName
+				});
+		}
+	});
+})();
Index: /CKEditor/trunk/_source/plugins/newpage/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/newpage/plugin.js	(revision 2997)
+++ /CKEditor/trunk/_source/plugins/newpage/plugin.js	(revision 2997)
@@ -0,0 +1,31 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @file Horizontal Page Break
+ */
+
+// Register a plugin named "newpage".
+CKEDITOR.plugins.add( 'newpage',
+{
+	init : function( editor, pluginPath )
+	{
+		editor.addCommand( 'newpage',
+			{
+				exec : function( editor )
+				{
+					editor.setData( editor.config.newpage_html );
+				}
+			});
+			
+		editor.ui.addButton( 'NewPage',
+			{
+				label : editor.lang.newpage,
+				command : 'newpage'
+			});
+	}
+});
+
+CKEDITOR.config.newpage_html = '';
Index: /CKEditor/trunk/_source/plugins/smiley/dialogs/smiley.js
===================================================================
--- /CKEditor/trunk/_source/plugins/smiley/dialogs/smiley.js	(revision 2997)
+++ /CKEditor/trunk/_source/plugins/smiley/dialogs/smiley.js	(revision 2997)
@@ -0,0 +1,97 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.dialog.add( 'smiley', function( editor )
+{
+	var config = editor.config.smiley,
+		images = config.images,
+		columns = config.columns,
+		i;
+
+	// Build the HTML for the smiley images table.
+	var html = [ '<table cellspacing="2" cellpadding="2"><tbody>' ];
+
+	for ( i = 0 ; i < images.length ; i++ )
+	{
+		if ( i % columns == 0 )
+			html.push( '<tr>' );
+
+		html.push( 
+			'<td class="dark_background hand centered" style="vertical-align: middle;">' +
+				'<img border="0" class="hand" title="', config.descriptions[i], '"' +
+					' src="', CKEDITOR.tools.htmlEncode( config.path + images[ i ] ), '"',
+					// IE BUG: Below is a workaround to an IE image loading bug to ensure the image sizes are correct.
+					( CKEDITOR.env.ie ? ' onload="this.setAttribute(\'width\', 2); this.removeAttribute(\'width\');" ' : '' ),
+				'>' +
+			'</td>' );
+
+		if ( i % columns == columns - 1 )
+			html.push( '</tr>' );
+	}
+
+	if ( i < columns - 1 )
+	{
+		for ( ; i < columns - 1 ; i++ )
+			html.push( '<td></td>' );
+		html.push( '</tr>' );
+	}
+
+	html.push( '</tbody></table>' );
+
+	var smileySelector =
+	{
+		type : 'html',
+		html : html.join( '' ),
+		onClick : function( evt )
+		{
+			var target = evt.data.getTarget(),
+				targetName = target.getName();
+
+			if ( targetName == 'td' )
+				target = target.getChild(0);
+			else if ( targetName != 'img' )
+				return;
+
+			this.getDialog().restoreSelection();
+			
+			var src = target.getAttribute( 'src' ),
+				title = target.getAttribute( 'title' );
+			
+			var img = editor.document.createElement( 'img',
+				{
+					attributes :
+					{
+						src : src,
+						_cke_saved_src : src,
+						title : title,
+						alt : title
+					}
+				});
+			
+			editor.insertElement( img );
+			
+			this.getDialog().hide();
+		},
+		style : 'width: 100%; height: 100%; border-collapse: separate;'
+	};
+
+	return {
+		title : editor.lang.smiley.title,
+		minWidth : config.windowWidth,
+		minHeight : config.windowHeight,
+		contents : [
+			{
+				id : 'tab1',
+				label : '',
+				title : '',
+				expand : true,
+				elements : [
+						smileySelector
+					]
+			}
+		],
+		buttons : [ CKEDITOR.dialog.cancelButton ]
+	};
+} );
Index: /CKEditor/trunk/_source/plugins/smiley/lang/en.js
===================================================================
--- /CKEditor/trunk/_source/plugins/smiley/lang/en.js	(revision 2997)
+++ /CKEditor/trunk/_source/plugins/smiley/lang/en.js	(revision 2997)
@@ -0,0 +1,13 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.setLang( 'smiley', 'en',
+{
+	smiley :
+	{
+		toolbar			: 'Smiley',
+		title			: 'Insert a Smiley'
+	}
+});
Index: /CKEditor/trunk/_source/plugins/smiley/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/smiley/plugin.js	(revision 2997)
+++ /CKEditor/trunk/_source/plugins/smiley/plugin.js	(revision 2997)
@@ -0,0 +1,43 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.plugins.add( 'smiley',
+{
+	init : function( editor, pluginPath )
+	{
+		editor.addCommand( 'smiley', new CKEDITOR.dialogCommand( 'smiley' ) );
+		editor.ui.addButton( 'Smiley',
+			{
+				label : editor.lang.smiley.toolbar,
+				command : 'smiley'
+			});
+		CKEDITOR.dialog.add( 'smiley', this.path + 'dialogs/smiley.js' );
+	},
+
+	lang : [ 'en' ]
+} );
+
+CKEDITOR.config.smiley =
+{
+	// TODO: update descriptions, fix coding style.
+	/**
+	 * List of smiley images displayed in the Smiley dialog.
+	 * @type Array
+	 * @default ['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif','embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif']
+	 * @example
+	 * config.smileyImages = [ 'tounge.gif', 'smile.gif', 'laugh.gif' ];
+	 */
+	images : [ 'regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif',
+	'embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif',
+	'devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif',
+	'broken_heart.gif','kiss.gif','envelope.gif'],
+	descriptions : [ ':)', ':(', ';)', ':D', ':/', ':P', '', '', '', '', '', '', '', ';(', '', '', '', '', ':kiss', '', ],
+
+	//TODO: update path
+	path : CKEDITOR.basePath +  '_source/plugins/smiley/images/',
+	windowWidth : 320,
+	windowHeight : 210,
+	columns : 8
+};
Index: /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js	(revision 2996)
+++ /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js	(revision 2997)
@@ -74,5 +74,5 @@
 
 			if ( CKEDITOR.env.ie )
-				$doc.selection.createRange().pasteHtml( evt.data );
+				$doc.selection.createRange().pasteHTML( evt.data );
 			else
 				$doc.execCommand( 'inserthtml', false, evt.data );
Index: /CKEditor/trunk/_source/themes/default/theme.js
===================================================================
--- /CKEditor/trunk/_source/themes/default/theme.js	(revision 2996)
+++ /CKEditor/trunk/_source/themes/default/theme.js	(revision 2997)
@@ -64,5 +64,5 @@
 						'<tr', bottomHtml	? '' : ' style="display:none"', '><td id="cke_bottom_'	, name, '" class="cke_bottom">'		, bottomHtml	, '</td></tr>' +
 					'</tbody></table>' +
-				'</span>' ].join('') );
+				'</span>' ].join( '' ) );
 
 			container.getChild( [0, 0, 0] ).unselectable();
@@ -90,60 +90,71 @@
 		buildDialog : function( editor )
 		{
-			var container = CKEDITOR.dom.element.createFromHtml( [
+			var baseIdNumber = CKEDITOR.tools.getNextNumber();
+
+			var element = CKEDITOR.dom.element.createFromHtml( [
 					'<div class="cke_skin_', editor.config.skin, ' ', browserCssClass, ' ',
 						CKEDITOR.document.$.compatMode == 'CSS1Compat' ? 'cke_mode_standards' : 'cke_mode_quirks',
-						' ', 'cke_', editor.lang.dir,
-						'" ', 'dir="', editor.lang.dir, '"><div id="%#" class="cke_dialog" style="position:',
-						( CKEDITOR.env.ie6Compat ? 'absolute;' : 'fixed;' ),
-						'">',
-						'<div>',
-							'<div id="%tl_#" class="%tl">',
-								'<div id="%tl_resize_#" class="%tl_resize"></div>',
-							'</div>',
-							'<div id="%t_#" class="%t">',
-								'<div id="%t_resize_#" class="%t_resize"></div>',
-							'</div>',
-							'<div id="%tr_#" class="%tr">',
-								'<div id="%tr_resize_#" class="%tr_resize"></div>',
-							'</div>',
-						'</div>',
-						'<div>',
-							'<div id="%l_#" class="%l">',
-								'<div id="%l_resize_#" class="%l_resize"></div>',
-							'</div>',
-							'<div id="%c_#" class="%c">',
-								'<div id="%title_#" class="%title">',
-									'<div id="%close_button_#" class="%close_button"></div>',
-								'</div>',
-								'<table id="%tabs_#" class="%tabs" cellpadding="0" border="0" cellspacing="0"><tbody><tr>',
-								'<td class="head_filler">&nbsp;</td>',
-								'<td class="tail_filler">&nbsp;</td>',
-								'</tr></tbody></table>',
-								'<div id="%contents_#" class="%contents"></div>',
-								'<div id="%footer_#" class="%footer"></div>',
-							'</div>',
-							'<div id="%r_#" class="%r">',
-								'<div id="%r_resize_#" class="%r_resize"></div>',
-							'</div>',
-						'</div>',
-						'<div>',
-							'<div id="%bl_#" class="%bl">',
-								'<div id="%bl_resize_#" class="%bl_resize"></div>',
-							'</div>',
-							'<div id="%b_#" class="%b">',
-								'<div id="%b_resize_#" class="%b_resize"></div>',
-							'</div>',
-							'<div id="%br_#" class="%br">',
-								'<div id="%br_resize_#" class="%br_resize"></div>',
-							'</div>',
-						'</div>',
-					'</div></div>'
+						' cke_', editor.lang.dir,
+						'" dir="', editor.lang.dir, '">' +
+						'<div id="%#" class="cke_dialog" style="position:',
+							( CKEDITOR.env.ie6Compat ? 'absolute;' : 'fixed;' ), '">',
+							'<div>'+
+								'<div id="%tl_#" class="%tl">' +
+									'<div id="%tl_resize_#" class="%tl_resize"></div>' +
+								'</div>' +
+								'<div id="%t_#" class="%t">' +
+									'<div id="%t_resize_#" class="%t_resize"></div>' +
+								'</div>' +
+								'<div id="%tr_#" class="%tr">' +
+									'<div id="%tr_resize_#" class="%tr_resize"></div>' +
+								'</div>' +
+							'</div>' +
+							'<div>' +
+								'<div id="%l_#" class="%l">' +
+									'<div id="%l_resize_#" class="%l_resize"></div>' +
+								'</div>' +
+								'<div id="%c_#" class="%c">' +
+									'<div id="%title_#" class="%title">' +
+										'<div id="%close_button_#" class="%close_button"></div>' +
+									'</div>' +
+									'<table id="%tabs_#" class="%tabs" cellpadding="0" border="0" cellspacing="0"><tbody><tr>' +
+									'<td class="head_filler">&nbsp;</td>' +
+									'<td class="tail_filler">&nbsp;</td>' +
+									'</tr></tbody></table>' +
+									'<div id="%contents_#" class="%contents"></div>' +
+									'<div id="%footer_#" class="%footer"></div>' +
+								'</div>' +
+								'<div id="%r_#" class="%r">' +
+									'<div id="%r_resize_#" class="%r_resize"></div>' +
+								'</div>' +
+							'</div>' +
+							'<div>' +
+								'<div id="%bl_#" class="%bl">' +
+									'<div id="%bl_resize_#" class="%bl_resize"></div>' +
+								'</div>' +
+								'<div id="%b_#" class="%b">' +
+									'<div id="%b_resize_#" class="%b_resize"></div>' +
+								'</div>' +
+								'<div id="%br_#" class="%br">' +
+									'<div id="%br_resize_#" class="%br_resize"></div>' +
+								'</div>' +
+							'</div>' +
+						'</div>' +
+					'</div>'
 				].join( '' )
-					.replace( /#/g, CKEDITOR.tools.getNextNumber() )
+					.replace( /#/g, baseIdNumber )
 					.replace( /%/g, 'cke_dialog_' ) );
 
-			container.getChild( [0, 1, 1, 0] ).unselectable();
+			// Make the Title unselectable.
+			element.getChild( [0, 1, 1, 0] ).unselectable();
 
-			return container;
+			return {
+				element : element,
+				titleId : 'cke_dialog_title_' + baseIdNumber,
+				contentsId : 'cke_dialog_contents_' + baseIdNumber,
+				footerId : 'cke_dialog_footer_' + baseIdNumber,
+				closeIds : [ 'cke_dialog_close_button_' + baseIdNumber ],
+				dragIds : [ 'cke_dialog_title_' + baseIdNumber, 'cke_dialog_tabs_' + baseIdNumber ]
+			};
 		},
 
