X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fuicolor%2Fdialogs%2Fuicolor.js;h=916b5d200a6a693b2cea84139830dd3cdbb65bc6;hb=48b1db88210b4160dce439c6e3e32e14af8c106b;hp=92d42e5ed7070f78b80c01263e7ca00297eded37;hpb=941b0a9ba4e673e292510d80a5a86806994b8ea6;p=ckeditor.git diff --git a/_source/plugins/uicolor/dialogs/uicolor.js b/_source/plugins/uicolor/dialogs/uicolor.js index 92d42e5..916b5d2 100644 --- a/_source/plugins/uicolor/dialogs/uicolor.js +++ b/_source/plugins/uicolor/dialogs/uicolor.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 */ @@ -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,7 +34,7 @@ CKEDITOR.dialog.add( 'uicolor', function( editor ) { id : 'yuiColorPicker', type : 'html', - html : "
", + html : "
", onLoad : function( event ) { var url = CKEDITOR.getUrl( @@ -42,7 +43,7 @@ CKEDITOR.dialog.add( 'uicolor', function( editor ) ); // 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,