X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fsmiley%2Fplugin.js;h=9156be8400351a92352ab469da1f9932f706ca0c;hb=refs%2Ftags%2Fv3.6.3;hp=d8a9fbf703edc7606134624468c095f644309d36;hpb=059b4c2fef02528bf1af189f7996e80652faddfb;p=ckeditor.git

diff --git a/_source/plugins/smiley/plugin.js b/_source/plugins/smiley/plugin.js
index d8a9fbf..9156be8 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-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -9,6 +9,7 @@ CKEDITOR.plugins.add( 'smiley',
 
 	init : function( editor )
 	{
+		editor.config.smiley_path = editor.config.smiley_path || ( this.path + 'images/' );
 		editor.addCommand( 'smiley', new CKEDITOR.dialogCommand( 'smiley' ) );
 		editor.ui.addButton( 'Smiley',
 			{
@@ -22,16 +23,14 @@ CKEDITOR.plugins.add( 'smiley',
 /**
  * The base path used to build the URL for the smiley images. It must end with
  * 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
  * config.smiley_path = '/images/smileys/';
  */
-CKEDITOR.config.smiley_path = CKEDITOR.basePath +
-	'_source/' +		// @Packager.RemoveLine
-	'plugins/smiley/images/';
 
 /**
  * The file names for the smileys to be displayed. These files must be
@@ -65,7 +64,7 @@ CKEDITOR.config.smiley_images = [
  * config.smiley_descriptions =
  *     [
  *         'smiley', 'sad', 'wink', 'laugh', 'frown', 'cheeky', 'blush', 'surprise',
- *         'indecision', 'angry', 'angle', 'cool', 'devil', 'crying', 'enlightened', 'no',
+ *         'indecision', 'angry', 'angel', 'cool', 'devil', 'crying', 'enlightened', 'no',
  *         'yes', 'heart', 'broken heart', 'kiss', 'mail'
  *     ];
  * @example
@@ -80,6 +79,16 @@ CKEDITOR.config.smiley_images = [
 CKEDITOR.config.smiley_descriptions =
 	[
 		'smiley', 'sad', 'wink', 'laugh', 'frown', 'cheeky', 'blush', 'surprise',
-		'indecision', 'angry', 'angle', 'cool', 'devil', 'crying', 'enlightened', 'no',
+		'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;
+ */