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.4.2
[ckeditor.git]
/
_source
/
plugins
/
colorbutton
/
plugin.js
diff --git
a/_source/plugins/colorbutton/plugin.js
b/_source/plugins/colorbutton/plugin.js
index
305c44d
..
0452230
100644
(file)
--- a/
_source/plugins/colorbutton/plugin.js
+++ b/
_source/plugins/colorbutton/plugin.js
@@
-161,7
+161,7
@@
CKEDITOR.plugins.add( 'colorbutton',
}
\r
\r
// Render the "More Colors" button.
\r
}
\r
\r
// Render the "More Colors" button.
\r
- if ( config.colorButton_enableMore )
\r
+ if ( config.colorButton_enableMore === undefined || config.colorButton_enableMore )
\r
{
\r
output.push(
\r
'</tr>' +
\r
{
\r
output.push(
\r
'</tr>' +
\r
@@
-174,7
+174,7
@@
CKEDITOR.plugins.add( 'colorbutton',
' role="option" aria-posinset="', total, '" aria-setsize="', total, '">',
\r
lang.more,
\r
'</a>' +
\r
' role="option" aria-posinset="', total, '" aria-setsize="', total, '">',
\r
lang.more,
\r
'</a>' +
\r
- '</td>' ); // It is later in the code.
\r
+ '</td>' ); // tr is later in the code.
\r
}
\r
\r
output.push( '</tr></table>' );
\r
}
\r
\r
output.push( '</tr></table>' );
\r
@@
-186,12
+186,11
@@
CKEDITOR.plugins.add( 'colorbutton',
\r
/**
\r
* Whether to enable the "More Colors..." button in the color selectors.
\r
\r
/**
\r
* Whether to enable the "More Colors..." button in the color selectors.
\r
- * @default false
\r
+ * @default true
\r
* @type Boolean
\r
* @example
\r
* config.colorButton_enableMore = false;
\r
*/
\r
* @type Boolean
\r
* @example
\r
* config.colorButton_enableMore = false;
\r
*/
\r
-CKEDITOR.config.colorButton_enableMore = true;
\r
\r
/**
\r
* Defines the colors to be displayed in the color selectors. It's a string
\r
\r
/**
\r
* Defines the colors to be displayed in the color selectors. It's a string
\r