X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=_source%2Fplugins%2Fuicolor%2Fdialogs%2Fuicolor.js;h=8c01f29fc850eb275e6ed70477ed372d31680fb6;hb=3fe9cac293e090ea459a3ee10d78cbe9e1dd0e03;hp=76d80317e942cd5bedc75c9c7604eda525d6d160;hpb=ea7e3453c7b0f023b050aca6d9f83ab372860d91;p=ckeditor.git

diff --git a/_source/plugins/uicolor/dialogs/uicolor.js b/_source/plugins/uicolor/dialogs/uicolor.js
index 76d8031..8c01f29 100644
--- a/_source/plugins/uicolor/dialogs/uicolor.js
+++ b/_source/plugins/uicolor/dialogs/uicolor.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -7,7 +7,8 @@ CKEDITOR.dialog.add( 'uicolor', function( editor )
 {
 	var dialog, picker, pickerContents,
 		// Actual UI color value.
-		uiColor = editor.getUiColor();
+		uiColor = editor.getUiColor(),
+		pickerId = 'cke_uicolor_picker' + CKEDITOR.tools.getNextNumber();
 
 	function setNewPickerColor( color )
 	{
@@ -16,7 +17,7 @@ CKEDITOR.dialog.add( 'uicolor', function( editor )
 			color = window.YAHOO.util.Color.hex2rgb( color.substr( 1 ) );
 		picker.setValue( color, true );
 		// Refresh picker UI.
-		picker.refresh( 'cke_uicolor_picker' );
+		picker.refresh( pickerId );
 	}
 
 	function setNewUiColor( color, force )
@@ -33,15 +34,16 @@ CKEDITOR.dialog.add( 'uicolor', function( editor )
 	{
 		id : 'yuiColorPicker',
 		type : 'html',
-		html : "<div id='cke_uicolor_picker' style='width: 360px; height: 200px; position: relative;'></div>",
+		html : "<div id='" + pickerId + "' class='cke_uicolor_picker' style='width: 360px; height: 200px; position: relative;'></div>",
 		onLoad : function( event )
 		{
 			var url = CKEDITOR.getUrl(
+					'_source/' + // @Packager.RemoveLine
 					'plugins/uicolor/yui/'
 				);
 
 			// Create new color picker widget.
-			picker = new window.YAHOO.widget.ColorPicker( "cke_uicolor_picker",
+			picker = new window.YAHOO.widget.ColorPicker( pickerId,
 				{
 					showhsvcontrols : true,
 					showhexcontrols : true,