Skip to content
Permalink
Browse files

Merge branch 't/10708' into major

  • Loading branch information...
oleq committed Sep 12, 2013
2 parents 1895ef4 + 1b709a6 commit 9b0267ea138933db43b18a46734527353ad4d544
Showing with 11 additions and 9 deletions.
  1. +3 −1 CHANGES.md
  2. BIN plugins/smiley/images/angel_smile.gif
  3. BIN plugins/smiley/images/angel_smile.png
  4. BIN plugins/smiley/images/angry_smile.gif
  5. BIN plugins/smiley/images/angry_smile.png
  6. BIN plugins/smiley/images/broken_heart.gif
  7. BIN plugins/smiley/images/broken_heart.png
  8. BIN plugins/smiley/images/confused_smile.gif
  9. BIN plugins/smiley/images/confused_smile.png
  10. BIN plugins/smiley/images/cry_smile.gif
  11. BIN plugins/smiley/images/cry_smile.png
  12. BIN plugins/smiley/images/devil_smile.gif
  13. BIN plugins/smiley/images/devil_smile.png
  14. BIN plugins/smiley/images/embaressed_smile.gif
  15. BIN plugins/smiley/images/embarrassed_smile.gif
  16. BIN plugins/smiley/images/embarrassed_smile.png
  17. BIN plugins/smiley/images/envelope.gif
  18. BIN plugins/smiley/images/envelope.png
  19. BIN plugins/smiley/images/heart.gif
  20. BIN plugins/smiley/images/heart.png
  21. BIN plugins/smiley/images/kiss.gif
  22. BIN plugins/smiley/images/kiss.png
  23. BIN plugins/smiley/images/lightbulb.gif
  24. BIN plugins/smiley/images/lightbulb.png
  25. BIN plugins/smiley/images/omg_smile.gif
  26. BIN plugins/smiley/images/omg_smile.png
  27. BIN plugins/smiley/images/regular_smile.gif
  28. BIN plugins/smiley/images/regular_smile.png
  29. BIN plugins/smiley/images/sad_smile.gif
  30. BIN plugins/smiley/images/sad_smile.png
  31. BIN plugins/smiley/images/shades_smile.gif
  32. BIN plugins/smiley/images/shades_smile.png
  33. BIN plugins/smiley/images/teeth_smile.gif
  34. BIN plugins/smiley/images/teeth_smile.png
  35. BIN plugins/smiley/images/thumbs_down.gif
  36. BIN plugins/smiley/images/thumbs_down.png
  37. BIN plugins/smiley/images/thumbs_up.gif
  38. BIN plugins/smiley/images/thumbs_up.png
  39. BIN plugins/smiley/images/tongue_smile.gif
  40. BIN plugins/smiley/images/tongue_smile.png
  41. BIN plugins/smiley/images/tounge_smile.gif
  42. BIN plugins/smiley/images/whatchutalkingabout_smile.gif
  43. BIN plugins/smiley/images/whatchutalkingabout_smile.png
  44. BIN plugins/smiley/images/wink_smile.gif
  45. BIN plugins/smiley/images/wink_smile.png
  46. +8 −8 plugins/smiley/plugin.js
@@ -1,7 +1,9 @@
CKEditor 4 Changelog
====================

## CKEditor 4.3
## CKEditor 4.3 beta

* [#10708](http://dev.ckeditor.com/ticket/10708): New smileys.

## CKEditor 4.2.1

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN +327 Bytes (170%) plugins/smiley/images/cry_smile.gif
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN +286 Bytes (170%) plugins/smiley/images/envelope.gif
Binary file not shown.
Binary file not shown.
BIN +908 Bytes (600%) plugins/smiley/images/heart.gif
Binary file not shown.
Binary file not shown.
BIN +841 Bytes (450%) plugins/smiley/images/kiss.gif
Binary file not shown.
Binary file not shown.
BIN +694 Bytes (290%) plugins/smiley/images/lightbulb.gif
Binary file not shown.
Binary file not shown.
BIN +756 Bytes (270%) plugins/smiley/images/omg_smile.gif
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
BIN +739 Bytes (260%) plugins/smiley/images/sad_smile.gif
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
BIN +716 Bytes (280%) plugins/smiley/images/thumbs_up.gif
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
BIN +756 Bytes (270%) plugins/smiley/images/wink_smile.gif
Diff not rendered.
Diff not rendered.
@@ -40,20 +40,20 @@ CKEDITOR.plugins.add( 'smiley', {
*
* // This is actually the default value.
* config.smiley_images = [
* 'regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tongue_smile.gif',
* 'embarrassed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif',
* 'devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif',
* 'broken_heart.gif','kiss.gif','envelope.gif'
* 'regular_smile.png','sad_smile.png','wink_smile.png','teeth_smile.png','confused_smile.png','tongue_smile.png',
* 'embarrassed_smile.png','omg_smile.png','whatchutalkingabout_smile.png','angry_smile.png','angel_smile.png','shades_smile.png',
* 'devil_smile.png','cry_smile.png','lightbulb.png','thumbs_down.png','thumbs_up.png','heart.png',
* 'broken_heart.png','kiss.png','envelope.png'
* ];
*
* @cfg
* @member CKEDITOR.config
*/
CKEDITOR.config.smiley_images = [
'regular_smile.gif', 'sad_smile.gif', 'wink_smile.gif', 'teeth_smile.gif', 'confused_smile.gif', 'tongue_smile.gif',
'embarrassed_smile.gif', 'omg_smile.gif', 'whatchutalkingabout_smile.gif', 'angry_smile.gif', 'angel_smile.gif', 'shades_smile.gif',
'devil_smile.gif', 'cry_smile.gif', 'lightbulb.gif', 'thumbs_down.gif', 'thumbs_up.gif', 'heart.gif',
'broken_heart.gif', 'kiss.gif', 'envelope.gif' ];
'regular_smile.png', 'sad_smile.png', 'wink_smile.png', 'teeth_smile.png', 'confused_smile.png', 'tongue_smile.png',
'embarrassed_smile.png', 'omg_smile.png', 'whatchutalkingabout_smile.png', 'angry_smile.png', 'angel_smile.png', 'shades_smile.png',
'devil_smile.png', 'cry_smile.png', 'lightbulb.png', 'thumbs_down.png', 'thumbs_up.png', 'heart.png',
'broken_heart.png', 'kiss.png', 'envelope.png' ];

/**
* The description to be used for each of the smileys defined in the

0 comments on commit 9b0267e

Please sign in to comment.
You can’t perform that action at this time.