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.2.1
[ckeditor.git]
/
_source
/
plugins
/
smiley
/
plugin.js
diff --git
a/_source/plugins/smiley/plugin.js
b/_source/plugins/smiley/plugin.js
index
d8a9fbf
..
d4ecda6
100644
(file)
--- a/
_source/plugins/smiley/plugin.js
+++ b/
_source/plugins/smiley/plugin.js
@@
-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,6
+23,7
@@
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
* @default {@link CKEDITOR.basePath} + 'plugins/smiley/images/'
\r
* @example
\r
* @type String
\r
* @default {@link CKEDITOR.basePath} + 'plugins/smiley/images/'
\r
* @example
\r
@@
-29,9
+31,6
@@
CKEDITOR.plugins.add( 'smiley',
* @example
\r
* config.smiley_path = '/images/smileys/';
\r
*/
\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