Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.2.2
[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
92d42e5
..
7d49394
100644
(file)
--- a/
_source/plugins/uicolor/dialogs/uicolor.js
+++ b/
_source/plugins/uicolor/dialogs/uicolor.js
@@
-7,7
+7,8
@@
CKEDITOR.dialog.add( 'uicolor', function( editor )
{
\r
var dialog, picker, pickerContents,
\r
// Actual UI color value.
\r
{
\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
\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
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
}
\r
\r
function setNewUiColor( color, force )
\r
@@
-33,7
+34,7
@@
CKEDITOR.dialog.add( 'uicolor', function( editor )
{
\r
id : 'yuiColorPicker',
\r
type : 'html',
\r
{
\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
onLoad : function( event )
\r
{
\r
var url = CKEDITOR.getUrl(
\r
@@
-42,7
+43,7
@@
CKEDITOR.dialog.add( 'uicolor', function( editor )
);
\r
\r
// Create new color picker widget.
\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
{
\r
showhsvcontrols : true,
\r
showhexcontrols : true,
\r