Merge branch 't/9633'

Author: Reinmar

dev/iconextractor/iconextractor.py

@@ -142,7 +142,8 @@
 	],
 	[
 		'about',
-		'uicolor'
+		'uicolor',
+		'placeholder'
 	]
 ]
 

plugins/menu/plugin.js

@@ -113,7 +113,7 @@ CKEDITOR.plugins.add( 'menu', {
 	menuItemSource +=
 				'<span class="cke_menubutton_inner">' +
 					'<span class="cke_menubutton_icon">' +
-						'<span class="cke_button_icon cke_button__{name}_icon" style="{iconStyle}"></span>' +
+						'<span class="cke_button_icon cke_button__{iconName}_icon" style="{iconStyle}"></span>' +
 					'</span>' +
 					'<span class="cke_menubutton_label">' +
 						'{label}' +
@@ -431,9 +431,14 @@ CKEDITOR.plugins.add( 'menu', {
 				// rtl: BLACK RIGHT-POINTING POINTER
 				var arrowLabel = '&#' + ( this.editor.lang.dir == 'rtl' ? '9668' : '9658' ) + ';';
 
+				var iconName = this.name;
+				if ( this.icon && !( /\./ ).test( this.icon ) )
+					iconName = this.icon;
+
 				var params = {
 					id: id,
 					name: this.name,
+					iconName: iconName,
 					label: this.label,
 					cls: this.className || '',
 					state: stateName,
@@ -446,7 +451,7 @@ CKEDITOR.plugins.add( 'menu', {
 					moveOutFn: menu._.itemOutFn,
 					clickFn: menu._.itemClickFn,
 					index: index,
-					iconStyle: CKEDITOR.skin.getIconStyle( this.name, ( this.editor.lang.dir == 'rtl' ), this.icon, this.iconOffset ),
+					iconStyle: CKEDITOR.skin.getIconStyle( iconName, ( this.editor.lang.dir == 'rtl' ), iconName == this.icon ? null : this.icon, this.iconOffset ),
 					arrowHtml: hasSubMenu ? menuArrowTpl.output({ label: arrowLabel } ) : ''
 				};
 

plugins/placeholder/icons/editplaceholder.png

@@ -13,7 +13,7 @@
 	CKEDITOR.plugins.add( 'placeholder', {
 		requires: 'dialog',
 		lang: 'en,bg,cs,cy,da,de,el,eo,et,fa,fi,fr,he,hr,it,nb,nl,no,pl,tr,ug,uk,vi,zh-cn', // %REMOVE_LINE_CORE%
-		icons: 'createplaceholder,editplaceholder', // %REMOVE_LINE_CORE%
+		icons: 'placeholder', // %REMOVE_LINE_CORE%
 		onLoad: function() {
 			CKEDITOR.addCss( '.cke_placeholder' +
 				'{' +
@@ -31,7 +31,8 @@
 			editor.ui.addButton && editor.ui.addButton( 'CreatePlaceholder', {
 				label: lang.toolbar,
 				command: 'createplaceholder',
-				toolbar: 'insert,5'
+				toolbar: 'insert,5',
+				icon: 'placeholder'
 			});
 
 			if ( editor.addMenuItems ) {
@@ -41,7 +42,8 @@
 						label: lang.edit,
 						command: 'editplaceholder',
 						group: 'placeholder',
-						order: 1
+						order: 1,
+						icon: 'placeholder'
 					}
 				});
 

plugins/placeholder/icons/placeholder.png

@@ -243,7 +243,7 @@ CKEDITOR.skin.chameleon = function( editor, part ) {
 		'indent,italic,justifyblock,justifycenter,justifyleft,justifyright,' +
 		'link,maximize,newpage-rtl,newpage,numberedlist-rtl,numberedlist,' +
 		'outdent-rtl,outdent,pagebreak-rtl,pagebreak,paste-rtl,paste,' +
-		'pastefromword-rtl,pastefromword,pastetext-rtl,pastetext,preview-rtl,' +
+		'pastefromword-rtl,pastefromword,pastetext-rtl,pastetext,placeholder,preview-rtl,' +
 		'preview,print,radio,redo-rtl,redo,removeformat,replace,save,scayt,' +
 		'select-rtl,select,selectall,showblocks-rtl,showblocks,smiley,' +
 		'source-rtl,source,specialchar,spellchecker,strike,subscript,' +