vanilla ckeditor-3.6.3

[ckeditor.git] / _source / plugins / uicolor / dialogs / uicolor.js

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