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.5.3
[ckeditor.git]
/
_source
/
plugins
/
smiley
/
plugin.js
diff --git
a/_source/plugins/smiley/plugin.js
b/_source/plugins/smiley/plugin.js
index
d4ecda6
..
bde383b
100644
(file)
--- a/
_source/plugins/smiley/plugin.js
+++ b/
_source/plugins/smiley/plugin.js
@@
-1,5
+1,5
@@
/*
\r
/*
\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
@@
-64,7
+64,7
@@
CKEDITOR.config.smiley_images = [
* config.smiley_descriptions =
\r
* [
\r
* 'smiley', 'sad', 'wink', 'laugh', 'frown', 'cheeky', 'blush', 'surprise',
\r
* config.smiley_descriptions =
\r
* [
\r
* 'smiley', 'sad', 'wink', 'laugh', 'frown', 'cheeky', 'blush', 'surprise',
\r
- * 'indecision', 'angry', 'angle', 'cool', 'devil', 'crying', 'enlightened', 'no',
\r
+ * 'indecision', 'angry', 'angel', 'cool', 'devil', 'crying', 'enlightened', 'no',
\r
* 'yes', 'heart', 'broken heart', 'kiss', 'mail'
\r
* ];
\r
* @example
\r
* 'yes', 'heart', 'broken heart', 'kiss', 'mail'
\r
* ];
\r
* @example
\r
@@
-79,6
+79,16
@@
CKEDITOR.config.smiley_images = [
CKEDITOR.config.smiley_descriptions =
\r
[
\r
'smiley', 'sad', 'wink', 'laugh', 'frown', 'cheeky', 'blush', 'surprise',
\r
CKEDITOR.config.smiley_descriptions =
\r
[
\r
'smiley', 'sad', 'wink', 'laugh', 'frown', 'cheeky', 'blush', 'surprise',
\r
- 'indecision', 'angry', 'angle', 'cool', 'devil', 'crying', 'enlightened', 'no',
\r
+ 'indecision', 'angry', 'angel', 'cool', 'devil', 'crying', 'enlightened', 'no',
\r
'yes', 'heart', 'broken heart', 'kiss', 'mail'
\r
];
\r
'yes', 'heart', 'broken heart', 'kiss', 'mail'
\r
];
\r
+
\r
+/**
\r
+ * The number of columns to be generated by the smilies matrix.
\r
+ * @name CKEDITOR.config.smiley_columns
\r
+ * @type Number
\r
+ * @default 8
\r
+ * @since 3.3.2
\r
+ * @example
\r
+ * config.smiley_columns = 6;
\r
+ */
\r