X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fplugins%2Fuicolor%2Fdialogs%2Fuicolor.js;h=7d493942ac4ed38db55539d115313a938542151f;hp=92d42e5ed7070f78b80c01263e7ca00297eded37;hb=8665a7c6c60586526e32e8941fe2896739b6ebfb;hpb=e7789c1ad838194d45eeee6ac2eb6e55f5cf35a1 diff --git a/_source/plugins/uicolor/dialogs/uicolor.js b/_source/plugins/uicolor/dialogs/uicolor.js index 92d42e5..7d49394 100644 --- a/_source/plugins/uicolor/dialogs/uicolor.js +++ b/_source/plugins/uicolor/dialogs/uicolor.js @@ -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,