Merge branch 't/10708' into major

ckeditor · Sep 12, 2013 · 9b0267e · 9b0267e
2 parents 1895ef4 + 1b709a6
commit 9b0267e
Show file tree

Hide file tree

Showing 46 changed files with 11 additions and 9 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -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
 

diff --git a/plugins/smiley/images/angel_smile.gif b/plugins/smiley/images/angel_smile.gif
diff --git a/plugins/smiley/images/angel_smile.png b/plugins/smiley/images/angel_smile.png
diff --git a/plugins/smiley/images/angry_smile.gif b/plugins/smiley/images/angry_smile.gif
diff --git a/plugins/smiley/images/angry_smile.png b/plugins/smiley/images/angry_smile.png
diff --git a/plugins/smiley/images/broken_heart.gif b/plugins/smiley/images/broken_heart.gif
diff --git a/plugins/smiley/images/broken_heart.png b/plugins/smiley/images/broken_heart.png
diff --git a/plugins/smiley/images/confused_smile.gif b/plugins/smiley/images/confused_smile.gif
diff --git a/plugins/smiley/images/confused_smile.png b/plugins/smiley/images/confused_smile.png
diff --git a/plugins/smiley/images/cry_smile.gif b/plugins/smiley/images/cry_smile.gif
diff --git a/plugins/smiley/images/cry_smile.png b/plugins/smiley/images/cry_smile.png
diff --git a/plugins/smiley/images/devil_smile.gif b/plugins/smiley/images/devil_smile.gif
diff --git a/plugins/smiley/images/devil_smile.png b/plugins/smiley/images/devil_smile.png
diff --git a/plugins/smiley/images/embaressed_smile.gif b/plugins/smiley/images/embaressed_smile.gif
diff --git a/plugins/smiley/images/embarrassed_smile.gif b/plugins/smiley/images/embarrassed_smile.gif
diff --git a/plugins/smiley/images/embarrassed_smile.png b/plugins/smiley/images/embarrassed_smile.png
diff --git a/plugins/smiley/images/envelope.gif b/plugins/smiley/images/envelope.gif
diff --git a/plugins/smiley/images/envelope.png b/plugins/smiley/images/envelope.png
diff --git a/plugins/smiley/images/heart.gif b/plugins/smiley/images/heart.gif
diff --git a/plugins/smiley/images/heart.png b/plugins/smiley/images/heart.png
diff --git a/plugins/smiley/images/kiss.gif b/plugins/smiley/images/kiss.gif
diff --git a/plugins/smiley/images/kiss.png b/plugins/smiley/images/kiss.png
diff --git a/plugins/smiley/images/lightbulb.gif b/plugins/smiley/images/lightbulb.gif
diff --git a/plugins/smiley/images/lightbulb.png b/plugins/smiley/images/lightbulb.png
diff --git a/plugins/smiley/images/omg_smile.gif b/plugins/smiley/images/omg_smile.gif
diff --git a/plugins/smiley/images/omg_smile.png b/plugins/smiley/images/omg_smile.png
diff --git a/plugins/smiley/images/regular_smile.gif b/plugins/smiley/images/regular_smile.gif
diff --git a/plugins/smiley/images/regular_smile.png b/plugins/smiley/images/regular_smile.png
diff --git a/plugins/smiley/images/sad_smile.gif b/plugins/smiley/images/sad_smile.gif
diff --git a/plugins/smiley/images/sad_smile.png b/plugins/smiley/images/sad_smile.png
diff --git a/plugins/smiley/images/shades_smile.gif b/plugins/smiley/images/shades_smile.gif
diff --git a/plugins/smiley/images/shades_smile.png b/plugins/smiley/images/shades_smile.png
diff --git a/plugins/smiley/images/teeth_smile.gif b/plugins/smiley/images/teeth_smile.gif
diff --git a/plugins/smiley/images/teeth_smile.png b/plugins/smiley/images/teeth_smile.png
diff --git a/plugins/smiley/images/thumbs_down.gif b/plugins/smiley/images/thumbs_down.gif
diff --git a/plugins/smiley/images/thumbs_down.png b/plugins/smiley/images/thumbs_down.png
diff --git a/plugins/smiley/images/thumbs_up.gif b/plugins/smiley/images/thumbs_up.gif
diff --git a/plugins/smiley/images/thumbs_up.png b/plugins/smiley/images/thumbs_up.png
diff --git a/plugins/smiley/images/tongue_smile.gif b/plugins/smiley/images/tongue_smile.gif
diff --git a/plugins/smiley/images/tongue_smile.png b/plugins/smiley/images/tongue_smile.png
diff --git a/plugins/smiley/images/tounge_smile.gif b/plugins/smiley/images/tounge_smile.gif
diff --git a/plugins/smiley/images/whatchutalkingabout_smile.gif b/plugins/smiley/images/whatchutalkingabout_smile.gif
diff --git a/plugins/smiley/images/whatchutalkingabout_smile.png b/plugins/smiley/images/whatchutalkingabout_smile.png
diff --git a/plugins/smiley/images/wink_smile.gif b/plugins/smiley/images/wink_smile.gif
diff --git a/plugins/smiley/images/wink_smile.png b/plugins/smiley/images/wink_smile.png
diff --git a/plugins/smiley/plugin.js b/plugins/smiley/plugin.js
@@ -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