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

diff --git a/_source/plugins/smiley/plugin.js b/_source/plugins/smiley/plugin.js
index 6e1804e..4d509ae 100644
--- a/_source/plugins/smiley/plugin.js
+++ b/_source/plugins/smiley/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, 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,6 +23,7 @@ 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/'
  * @example
@@ -29,9 +31,6 @@ CKEDITOR.plugins.add( 'smiley',
  * @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
@@ -59,17 +58,27 @@ CKEDITOR.config.smiley_images = [
  * must match its relative pair in the {@link CKEDITOR.config.smiley_images}
  * setting.
  * @type Array
- * @default (see example)
+ * @default  The textual descriptions of smiley.
  * @example
- * // This is actually the default value.
- * config.smiley_descriptions = [
- *     ':)', ':(', ';)', ':D', ':/', ':P',
- *     '', '', '', '', '', '',
- *     '', ';(', '', '', '', '',
- *     '', ':kiss', '' ];
+ * // Default settings.
+ * config.smiley_descriptions =
+ *     [
+ *         'smiley', 'sad', 'wink', 'laugh', 'frown', 'cheeky', 'blush', 'surprise',
+ *         'indecision', 'angry', 'angel', 'cool', 'devil', 'crying', 'enlightened', 'no',
+ *         'yes', 'heart', 'broken heart', 'kiss', 'mail'
+ *     ];
+ * @example
+ * // Use textual emoticons as description.
+ * config.smiley_descriptions =
+ *     [
+ *         ':)', ':(', ';)', ':D', ':/', ':P', ':*)', ':-o',
+ *         ':|', '>:(', 'o:)', '8-)', '>:-)', ';(', '', '', '',
+ *         '', '', ':-*', ''
+ *     ];
  */
-CKEDITOR.config.smiley_descriptions = [
-	':)', ':(', ';)', ':D', ':/', ':P',
-	'', '', '', '', '', '',
-	'', ';(', '', '', '', '',
-	'', ':kiss', '' ];
+CKEDITOR.config.smiley_descriptions =
+	[
+		'smiley', 'sad', 'wink', 'laugh', 'frown', 'cheeky', 'blush', 'surprise',
+		'indecision', 'angry', 'angel', 'cool', 'devil', 'crying', 'enlightened', 'no',
+		'yes', 'heart', 'broken heart', 'kiss', 'mail'
+	];