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.6.6
[ckeditor.git]
/
_source
/
plugins
/
smiley
/
plugin.js
diff --git
a/_source/plugins/smiley/plugin.js
b/_source/plugins/smiley/plugin.js
index
d8a9fbf
..
9eccf85
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-2013, 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
@@
-9,6
+9,7
@@
CKEDITOR.plugins.add( 'smiley',
\r
init : function( editor )
\r
{
\r
\r
init : function( editor )
\r
{
\r
+ editor.config.smiley_path = editor.config.smiley_path || ( this.path + 'images/' );
\r
editor.addCommand( 'smiley', new CKEDITOR.dialogCommand( 'smiley' ) );
\r
editor.ui.addButton( 'Smiley',
\r
{
\r
editor.addCommand( 'smiley', new CKEDITOR.dialogCommand( 'smiley' ) );
\r
editor.ui.addButton( 'Smiley',
\r
{
\r
@@
-22,16
+23,14
@@
CKEDITOR.plugins.add( 'smiley',
/**
\r
* The base path used to build the URL for the smiley images. It must end with
\r
* a slash.
\r
/**
\r
* The base path used to build the URL for the smiley images. It must end with
\r
* a slash.
\r
+ * @name CKEDITOR.config.smiley_path
\r
* @type String
\r
* @type String
\r
- * @default {@link CKEDITOR.basePath} + 'plugins/smiley/images/'
\r
+ * @default <code><em>CKEDITOR.basePath</em> + 'plugins/smiley/images/'</code>
\r
* @example
\r
* config.smiley_path = 'http://www.example.com/images/smileys/';
\r
* @example
\r
* config.smiley_path = '/images/smileys/';
\r
*/
\r
* @example
\r
* config.smiley_path = 'http://www.example.com/images/smileys/';
\r
* @example
\r
* config.smiley_path = '/images/smileys/';
\r
*/
\r
-CKEDITOR.config.smiley_path = CKEDITOR.basePath +
\r
- '_source/' + // @Packager.RemoveLine
\r
- 'plugins/smiley/images/';
\r
\r
/**
\r
* The file names for the smileys to be displayed. These files must be
\r
\r
/**
\r
* The file names for the smileys to be displayed. These files must be
\r
@@
-65,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
@@
-80,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