ckeditor 3.4.1 → 3.4.2.pre

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/lang/no.js

@@ -712,7 +712,7 @@ CKEDITOR.lang['no'] =
 		dic_restore		: 'Restore', // MISSING
 		dic_delete		: 'Delete', // MISSING
 		dic_rename		: 'Rename', // MISSING
-		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type it\'s name and click the Restore button.', // MISSING
+		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING
 
 		aboutTab		: 'Om'
 	},

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/lang/pl.js

@@ -712,7 +712,7 @@ CKEDITOR.lang['pl'] =
 		dic_restore		: 'Restore', // MISSING
 		dic_delete		: 'Delete', // MISSING
 		dic_rename		: 'Rename', // MISSING
-		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type it\'s name and click the Restore button.', // MISSING
+		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING
 
 		aboutTab		: 'Na temat SCAYT'
 	},

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/lang/pt.js

@@ -712,7 +712,7 @@ CKEDITOR.lang['pt'] =
 		dic_restore		: 'Restore', // MISSING
 		dic_delete		: 'Delete', // MISSING
 		dic_rename		: 'Rename', // MISSING
-		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type it\'s name and click the Restore button.', // MISSING
+		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING
 
 		aboutTab		: 'About' // MISSING
 	},

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/lang/ro.js

@@ -712,7 +712,7 @@ CKEDITOR.lang['ro'] =
 		dic_restore		: 'Restore', // MISSING
 		dic_delete		: 'Delete', // MISSING
 		dic_rename		: 'Rename', // MISSING
-		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type it\'s name and click the Restore button.', // MISSING
+		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING
 
 		aboutTab		: 'About' // MISSING
 	},

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/lang/ru.js

@@ -712,7 +712,7 @@ CKEDITOR.lang['ru'] =
 		dic_restore		: 'Restore', // MISSING
 		dic_delete		: 'Delete', // MISSING
 		dic_rename		: 'Rename', // MISSING
-		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type it\'s name and click the Restore button.', // MISSING
+		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING
 
 		aboutTab		: 'О словарях'
 	},

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/lang/sk.js

@@ -712,7 +712,7 @@ CKEDITOR.lang['sk'] =
 		dic_restore		: 'Restore', // MISSING
 		dic_delete		: 'Delete', // MISSING
 		dic_rename		: 'Rename', // MISSING
-		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type it\'s name and click the Restore button.', // MISSING
+		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING
 
 		aboutTab		: 'About' // MISSING
 	},

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/lang/sl.js

@@ -712,7 +712,7 @@ CKEDITOR.lang['sl'] =
 		dic_restore		: 'Restore', // MISSING
 		dic_delete		: 'Delete', // MISSING
 		dic_rename		: 'Rename', // MISSING
-		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type it\'s name and click the Restore button.', // MISSING
+		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING
 
 		aboutTab		: 'O storitvi'
 	},

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/lang/sr-latn.js

@@ -712,7 +712,7 @@ CKEDITOR.lang['sr-latn'] =
 		dic_restore		: 'Restore', // MISSING
 		dic_delete		: 'Delete', // MISSING
 		dic_rename		: 'Rename', // MISSING
-		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type it\'s name and click the Restore button.', // MISSING
+		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING
 
 		aboutTab		: 'About' // MISSING
 	},

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/lang/sr.js

@@ -712,7 +712,7 @@ CKEDITOR.lang['sr'] =
 		dic_restore		: 'Restore', // MISSING
 		dic_delete		: 'Delete', // MISSING
 		dic_rename		: 'Rename', // MISSING
-		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type it\'s name and click the Restore button.', // MISSING
+		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING
 
 		aboutTab		: 'About' // MISSING
 	},

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/lang/sv.js

@@ -712,7 +712,7 @@ CKEDITOR.lang['sv'] =
 		dic_restore		: 'Restore', // MISSING
 		dic_delete		: 'Delete', // MISSING
 		dic_rename		: 'Rename', // MISSING
-		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type it\'s name and click the Restore button.', // MISSING
+		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING
 
 		aboutTab		: 'About' // MISSING
 	},

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/lang/th.js

@@ -712,7 +712,7 @@ CKEDITOR.lang['th'] =
 		dic_restore		: 'Restore', // MISSING
 		dic_delete		: 'Delete', // MISSING
 		dic_rename		: 'Rename', // MISSING
-		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type it\'s name and click the Restore button.', // MISSING
+		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING
 
 		aboutTab		: 'About' // MISSING
 	},

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/lang/uk.js

@@ -712,7 +712,7 @@ CKEDITOR.lang['uk'] =
 		dic_restore		: 'Restore', // MISSING
 		dic_delete		: 'Delete', // MISSING
 		dic_rename		: 'Rename', // MISSING
-		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type it\'s name and click the Restore button.', // MISSING
+		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING
 
 		aboutTab		: 'Про'
 	},

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/lang/vi.js

@@ -712,7 +712,7 @@ CKEDITOR.lang['vi'] =
 		dic_restore		: 'Phục hồi',
 		dic_delete		: 'Xóa',
 		dic_rename		: 'Thay tên',
-		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type it\'s name and click the Restore button.', // MISSING
+		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING
 
 		aboutTab		: 'Thông tin'
 	},

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/lang/zh-cn.js

@@ -98,17 +98,17 @@ CKEDITOR.lang['zh-cn'] =
 		advancedTab		: '高级',
 		validateNumberFailed : '需要输入数字格式',
 		confirmNewPage	: '当前文档内容未保存,是否确认新建文档？',
-		confirmCancel	: '部分选项尚未保存，是否确认关闭对话框？',
+		confirmCancel	: '部分修改尚未保存，是否确认关闭对话框？',
 		options			: '选项',
 		target			: '目标窗口',
 		targetNew		: '新窗口 (_blank)',
 		targetTop		: '整页 (_top)',
 		targetSelf		: '本窗口 (_self)',
 		targetParent	: '父窗口 (_parent)',
-		langDirLTR		: 'Left to Right (LTR)', // MISSING
-		langDirRTL		: 'Right to Left (RTL)', // MISSING
-		styles			: 'Style', // MISSING
-		cssClasses		: 'Stylesheet Classes', // MISSING
+		langDirLTR		: '从左到右 (LTR)',
+		langDirRTL		: '从右到左 (RTL)',
+		styles			: '样式',
+		cssClasses		: '样式类',
 
 		// Put the voice-only part of the label in the span.
 		unavailable		: '%1<span class="cke_accessibility">, 不可用</span>'
@@ -200,7 +200,7 @@ CKEDITOR.lang['zh-cn'] =
 		bulletedTitle		: '项目列表属性',
 		type				: '标记类型',
 		start				: '开始序号',
-		validateStartNumber				:'List start number must be a whole number.', // MISSING
+		validateStartNumber				:'列表开始序号必须为整数格式',
 		circle				: '空心圆',
 		disc				: '实心圆',
 		square				: '实心方块',
@@ -287,10 +287,10 @@ CKEDITOR.lang['zh-cn'] =
 			wordWrap		: '自动换行',
 			hAlign			: '水平对齐',
 			vAlign			: '垂直对齐',
-			alignTop		: '顶端对齐',
-			alignMiddle		: '中间对齐',
-			alignBottom		: '底部对齐',
-			alignBaseline	: '基线对齐',
+			alignTop		: '顶端',
+			alignMiddle		: '中间',
+			alignBottom		: '底部',
+			alignBaseline	: '基线',
 			bgColor			: '背景颜色',
 			borderColor		: '边框颜色',
 			data			: '数据',
@@ -712,7 +712,7 @@ CKEDITOR.lang['zh-cn'] =
 		dic_restore		: '还原',
 		dic_delete		: '删除',
 		dic_rename		: '重命名',
-		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type it\'s name and click the Restore button.', // MISSING
+		dic_info		: '一开始用户词典储存在 Cookie 中, 但是 Cookies 的容量是有限的, 当用户词典增长到超出 Cookie 限制时就无法再储存了, 这时您可以将词典储存到我们的服务器上. 要把您的个人词典到储存到我们的服务器上的话, 需要为您的词典指定一个名称, 如果您在我们的服务器上已经有储存有一个词典, 请输入词典名称并按还原按钮.',
 
 		aboutTab		: '关于'
 	},
@@ -722,7 +722,7 @@ CKEDITOR.lang['zh-cn'] =
 		title		: '关于CKEditor',
 		dlgTitle	: '关于CKEditor',
 		moreInfo	: '访问我们的网站以获取更多关于协议的信息',
-		copy		: '版权所有 &copy; $1.'
+		copy		: 'Copyright &copy; $1. All rights reserved.'
 	},
 
 	maximize : '全屏',
@@ -731,9 +731,9 @@ CKEDITOR.lang['zh-cn'] =
 	fakeobjects :
 	{
 		anchor	: '锚点',
-		flash	: 'Flash',
+		flash	: 'Flash 动画',
 		div		: '分页',
-		unknown	: '位置对象'
+		unknown	: '未知对象'
 	},
 
 	resize : '拖拽以改变尺寸',
@@ -752,7 +752,7 @@ CKEDITOR.lang['zh-cn'] =
 
 	bidi :
 	{
-		ltr : 'Text direction from left to right', // MISSING
-		rtl : 'Text direction from right to left' // MISSING
+		ltr : '文字方向为从左至右',
+		rtl : '文字方向为从右至左'
 	}
 };

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/lang/zh.js

@@ -712,7 +712,7 @@ CKEDITOR.lang['zh'] =
 		dic_restore		: 'Restore', // MISSING
 		dic_delete		: 'Delete', // MISSING
 		dic_rename		: 'Rename', // MISSING
-		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type it\'s name and click the Restore button.', // MISSING
+		dic_info		: 'Initially the User Dictionary is stored in a Cookie. However, Cookies are limited in size. When the User Dictionary grows to a point where it cannot be stored in a Cookie, then the dictionary may be stored on our server. To store your personal dictionary on our server you should specify a name for your dictionary. If you already have a stored dictionary, please type its name and click the Restore button.', // MISSING
 
 		aboutTab		: '關於'
 	},

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/plugins/bidi/plugin.js

@@ -11,12 +11,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 	function onSelectionChange( evt )
 	{
-		evt.editor.getCommand( 'bidirtl' ).setState( getState( evt.editor, evt.data.path, 'rtl' ) );
-		evt.editor.getCommand( 'bidiltr' ).setState( getState( evt.editor, evt.data.path, 'ltr' ) );
-	}
-
-	function getState( editor, path, dir )
-	{
+		var editor = evt.editor,
+			path = evt.data.path;
 		var useComputedState = editor.config.useComputedState,
 			selectedElement;
 
@@ -39,14 +35,21 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		selectedElement = selectedElement || path.block || path.blockLimit;
 
 		if ( !selectedElement || selectedElement.getName() == 'body' )
-			return CKEDITOR.TRISTATE_OFF;
+			return;
 
-		selectedElement = useComputedState ?
+		var selectionDir = useComputedState ?
 			selectedElement.getComputedStyle( 'direction' ) :
 			selectedElement.getStyle( 'direction' ) || selectedElement.getAttribute( 'dir' );
 
-		return ( selectedElement == dir ) ?
-			CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF;
+		editor.getCommand( 'bidirtl' ).setState( selectionDir == 'rtl' ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF );
+		editor.getCommand( 'bidiltr' ).setState( selectionDir == 'ltr' ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF );
+
+		var chromeRoot = editor.container.getChild( 1 );
+
+		if ( selectionDir != editor.lang.dir )
+			chromeRoot.addClass( 'cke_mixed_dir_content' );
+		else
+			chromeRoot.removeClass( 'cke_mixed_dir_content' );
 	}
 
 	function switchDir( element, dir, editor )

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/plugins/dialog/plugin.js

@@ -68,6 +68,30 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 		return null;
 	}
 
+
+	function clearOrRecoverTextInputValue( container, isRecover )
+	{
+		var inputs = container.$.getElementsByTagName( 'input' );
+		for ( var i = 0, length = inputs.length; i < length ; i++ )
+		{
+			var item = new CKEDITOR.dom.element( inputs[ i ] );
+
+			if ( item.getAttribute( 'type' ).toLowerCase() == 'text' )
+			{
+				if ( isRecover )
+				{
+					item.setAttribute( 'value', item.getCustomData( 'fake_value' ) || '' );
+					item.removeCustomData( 'fake_value' );
+				}
+				else
+				{
+					item.setCustomData( 'fake_value', item.getAttribute( 'value' ) );
+					item.setAttribute( 'value', '' );
+				}
+			}
+		}
+	}
+
 	/**
 	 * This is the base class for runtime dialog objects. An instance of this
 	 * class represents a single named dialog for a single editor instance.
@@ -685,12 +709,12 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 			// First, set the dialog to an appropriate size.
 			this.resize( definition.minWidth, definition.minHeight );
 
-			// Select the first tab by default.
-			this.selectPage( this.definition.contents[0].id );
-
 			// Reset all inputs back to their default value.
 			this.reset();
 
+			// Select the first tab by default.
+			this.selectPage( this.definition.contents[0].id );
+
 			// Set z-index.
 			if ( CKEDITOR.dialog._.currentZIndex === null )
 				CKEDITOR.dialog._.currentZIndex = this._.editor.config.baseFloatZIndex;
@@ -968,7 +992,25 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 
 			var selected = this._.tabs[id];
 			selected[0].addClass( 'cke_dialog_tab_selected' );
-			selected[1].show();
+
+			// [IE] a unvisible input[type='text'] will enlarge it's width
+			// if it's value is long when it show( #5649 )
+			// so we clear it's value before it shows and then recover it
+			if ( CKEDITOR.env.ie6Compat || CKEDITOR.env.ie7Compat )
+			{
+				clearOrRecoverTextInputValue( selected[1] );
+				selected[1].show();
+				setTimeout( function()
+				{
+					clearOrRecoverTextInputValue( selected[1], true );
+				}, 0 );
+			}
+			else
+			{
+				selected[1].show();
+			}
+
+
 			this._.currentTabId = id;
 			this._.currentTabIndex = CKEDITOR.tools.indexOf( this._.tabIdList, id );
 		},

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/plugins/dialogadvtab/plugin.js

@@ -98,7 +98,7 @@ CKEDITOR.plugins.add( 'dialogadvtab',
 						type : 'select',
 						label : lang.langDir,
 						'default' : '',
-						style : 'width:110px',
+						style : 'width:100%',
 						items :
 						[
 							[ lang.notSet, '' ],
@@ -122,7 +122,7 @@ CKEDITOR.plugins.add( 'dialogadvtab',
 		{
 			contents = [];
 
-			if ( tabConfig.id )
+			if ( tabConfig.styles )
 			{
 				contents.push(
 					{

data/{generators/ckeditor_install → lib/generators/ckeditor/base}/templates/ckeditor/_source/plugins/div/dialogs/div.js

@@ -330,7 +330,13 @@
 								{
 									var styleName;
 									if ( ( styleName = this.getValue() ) )
-										styles[ styleName ].applyToObject( element );
+									{
+										var style = styles[ styleName ];
+										var customData = element.getCustomData( 'elementStyle' ) || '';
+
+										style.applyToObject( element );
+										element.setCustomData( 'elementStyle', customData + style._.definition.attributes.style );
+									}
 								}
 							},
 							{
@@ -386,9 +392,8 @@
 											commit : function( element )
 											{
 												// Merge with 'elementStyle', which is of higher priority.
-												var value = this.getValue(),
-														merged = [ value, element.getAttribute( 'style' ) ].join( ';' );
-												value && element.setAttribute( 'style', merged );
+												var merged = this.getValue() + ( element.getCustomData( 'elementStyle' ) || '' );
+												element.setAttribute( 'style', merged );
 											}
 										}
 								]
@@ -503,6 +508,9 @@
 			},
 			onHide : function()
 			{
+				// Remove style only when editing existing DIV. (#6315)
+				if ( command == 'editdiv' )
+					this._element.removeCustomData( 'elementStyle' );
 				delete this._element;
 			}
 		};