X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fsmiley%2Fplugin.js;h=9eccf85b040226f3e2c071f6ef9418335e35d9b4;hb=a272c66d841421f8bf933c16535bdcde1c4649fc;hp=4d509ae22752b2c523773d7ebcba8e6ea77f8cf5;hpb=8665a7c6c60586526e32e8941fe2896739b6ebfb;p=ckeditor.git

diff --git a/_source/plugins/smiley/plugin.js b/_source/plugins/smiley/plugin.js
index 4d509ae..9eccf85 100644
--- a/_source/plugins/smiley/plugin.js
+++ b/_source/plugins/smiley/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -25,7 +25,7 @@ CKEDITOR.plugins.add( 'smiley',
  * a slash.
  * @name CKEDITOR.config.smiley_path
  * @type String
- * @default {@link CKEDITOR.basePath} + 'plugins/smiley/images/'
+ * @default <code><em>CKEDITOR.basePath</em> + 'plugins/smiley/images/'</code>
  * @example
  * config.smiley_path = 'http://www.example.com/images/smileys/';
  * @example
@@ -82,3 +82,13 @@ CKEDITOR.config.smiley_descriptions =
 		'indecision', 'angry', 'angel', 'cool', 'devil', 'crying', 'enlightened', 'no',
 		'yes', 'heart', 'broken heart', 'kiss', 'mail'
 	];
+
+/**
+ * The number of columns to be generated by the smilies matrix.
+ * @name CKEDITOR.config.smiley_columns
+ * @type Number
+ * @default 8
+ * @since 3.3.2
+ * @example
+ * config.smiley_columns = 6;
+ */