X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fplugins%2Fmenu%2Fplugin.js;h=02b0ea309cece93fc99a68621e0ae6d229616539;hp=5d37ffda020723f252a92c96819f7fb8227f90d3;hb=48b1db88210b4160dce439c6e3e32e14af8c106b;hpb=9afde8772159bd3436f1f5b7862960307710ae5a

diff --git a/_source/plugins/menu/plugin.js b/_source/plugins/menu/plugin.js
index 5d37ffd..02b0ea3 100644
--- a/_source/plugins/menu/plugin.js
+++ b/_source/plugins/menu/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -49,7 +49,7 @@ CKEDITOR.plugins.add( 'menu',
 		$ : function( editor, definition )
 		{
 			definition = this._.definition = definition || {};
-			this.id = 'cke_' + CKEDITOR.tools.getNextNumber();
+			this.id = CKEDITOR.tools.getNextId();
 
 			this.editor = editor;
 			this.items = [];
@@ -411,7 +411,7 @@ CKEDITOR.plugins.add( 'menu',
 			var hasSubMenu = this.getItems;
 
 			output.push(
-				'<span class="cke_menuitem">' +
+				'<span class="cke_menuitem' + ( this.icon && this.icon.indexOf( '.png' ) == -1 ? ' cke_noalphafix' : '' ) + '">' +
 				'<a id="', id, '"' +
 					' class="', classes, '" href="javascript:void(\'', ( this.label || '' ).replace( "'", '' ), '\')"' +
 					' title="', this.label, '"' +