diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js
new file mode 100644
index 00000000..4783bc37
--- /dev/null
+++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.EmotionsPlugin",{init:function(a,b){a.addCommand("mceEmotion",function(){a.windowManager.open({file:b+"/emotions.htm",width:250+parseInt(a.getLang("emotions.delta_width",0)),height:160+parseInt(a.getLang("emotions.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("emotions",{title:"emotions.emotions_desc",cmd:"mceEmotion"})},getInfo:function(){return{longname:"Emotions",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("emotions",tinymce.plugins.EmotionsPlugin)})();
\ No newline at end of file
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js
new file mode 100644
index 00000000..df0d370a
--- /dev/null
+++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js
@@ -0,0 +1,40 @@
+/**
+ * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+ tinymce.create('tinymce.plugins.EmotionsPlugin', {
+ init : function(ed, url) {
+ // Register commands
+ ed.addCommand('mceEmotion', function() {
+ ed.windowManager.open({
+ file : url + '/emotions.htm',
+ width : 250 + parseInt(ed.getLang('emotions.delta_width', 0)),
+ height : 160 + parseInt(ed.getLang('emotions.delta_height', 0)),
+ inline : 1
+ }, {
+ plugin_url : url
+ });
+ });
+
+ // Register buttons
+ ed.addButton('emotions', {title : 'emotions.emotions_desc', cmd : 'mceEmotion'});
+ },
+
+ getInfo : function() {
+ return {
+ longname : 'Emotions',
+ author : 'Moxiecode Systems AB',
+ authorurl : 'http://tinymce.moxiecode.com',
+ infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions',
+ version : tinymce.majorVersion + "." + tinymce.minorVersion
+ };
+ }
+ });
+
+ // Register plugin
+ tinymce.PluginManager.add('emotions', tinymce.plugins.EmotionsPlugin);
+})();
\ No newline at end of file
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
new file mode 100644
index 00000000..55a1d72f
--- /dev/null
+++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
@@ -0,0 +1,40 @@
+
+
+
+ {#emotions_dlg.title}
+
+
+
+
+
+
+
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/emotions.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/emotions.gif
new file mode 100644
index 00000000..a39ed8ec
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/emotions.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/index.html b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/index.html
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-cool.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-cool.gif
new file mode 100644
index 00000000..ba90cc36
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-cool.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-cry.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-cry.gif
new file mode 100644
index 00000000..74d897a4
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-cry.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-embarassed.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-embarassed.gif
new file mode 100644
index 00000000..963a96b8
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-embarassed.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-foot-in-mouth.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-foot-in-mouth.gif
new file mode 100644
index 00000000..16f68cc1
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-foot-in-mouth.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-frown.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-frown.gif
new file mode 100644
index 00000000..716f55e1
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-frown.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-innocent.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-innocent.gif
new file mode 100644
index 00000000..334d49e0
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-innocent.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-kiss.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-kiss.gif
new file mode 100644
index 00000000..4efd549e
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-kiss.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-laughing.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-laughing.gif
new file mode 100644
index 00000000..1606c119
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-laughing.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-money-mouth.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-money-mouth.gif
new file mode 100644
index 00000000..ca2451e1
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-money-mouth.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-sealed.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-sealed.gif
new file mode 100644
index 00000000..b33d3cca
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-sealed.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-smile.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-smile.gif
new file mode 100644
index 00000000..e6a9e60d
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-smile.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-surprised.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-surprised.gif
new file mode 100644
index 00000000..cb99cdd9
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-surprised.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-tongue-out.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-tongue-out.gif
new file mode 100644
index 00000000..2075dc16
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-tongue-out.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-undecided.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-undecided.gif
new file mode 100644
index 00000000..bef7e257
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-undecided.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-wink.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-wink.gif
new file mode 100644
index 00000000..9faf1aff
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-wink.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-yell.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-yell.gif
new file mode 100644
index 00000000..648e6e87
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/images/smiley-yell.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/index.html b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/index.html
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cool.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cool.gif
new file mode 100644
index 00000000..ba90cc36
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cool.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cry.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cry.gif
new file mode 100644
index 00000000..74d897a4
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cry.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
new file mode 100644
index 00000000..963a96b8
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
new file mode 100644
index 00000000..16f68cc1
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-frown.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-frown.gif
new file mode 100644
index 00000000..716f55e1
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-frown.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif
new file mode 100644
index 00000000..334d49e0
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif
new file mode 100644
index 00000000..4efd549e
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif
new file mode 100644
index 00000000..1606c119
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
new file mode 100644
index 00000000..ca2451e1
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif
new file mode 100644
index 00000000..b33d3cca
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif
new file mode 100644
index 00000000..e6a9e60d
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif
new file mode 100644
index 00000000..cb99cdd9
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
new file mode 100644
index 00000000..2075dc16
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif
new file mode 100644
index 00000000..bef7e257
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif
new file mode 100644
index 00000000..9faf1aff
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-yell.gif b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-yell.gif
new file mode 100644
index 00000000..648e6e87
Binary files /dev/null and b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-yell.gif differ
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/index.html b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/index.html
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
new file mode 100644
index 00000000..c5493670
--- /dev/null
+++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
@@ -0,0 +1,22 @@
+tinyMCEPopup.requireLangPack();
+
+var EmotionsDialog = {
+ init : function(ed) {
+ tinyMCEPopup.resizeToInnerSize();
+ },
+
+ insert : function(file, title) {
+ var ed = tinyMCEPopup.editor, dom = ed.dom;
+
+ tinyMCEPopup.execCommand('mceInsertContent', false, dom.createHTML('img', {
+ src : tinyMCEPopup.getWindowArg('plugin_url') + '/img/' + file,
+ alt : ed.getLang(title),
+ title : ed.getLang(title),
+ border : 0
+ }));
+
+ tinyMCEPopup.close();
+ }
+};
+
+tinyMCEPopup.onInit.add(EmotionsDialog.init, EmotionsDialog);
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/js/index.html b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/js/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/js/index.html
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/jscripts/functions.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/jscripts/functions.js
new file mode 100644
index 00000000..95a9eafe
--- /dev/null
+++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/jscripts/functions.js
@@ -0,0 +1,21 @@
+function init() {
+ tinyMCEPopup.resizeToInnerSize();
+}
+
+function insertEmotion(file_name, title) {
+ title = tinyMCE.getLang(title);
+
+ if (title == null)
+ title = "";
+
+ // XML encode
+ title = title.replace(/&/g, '&');
+ title = title.replace(/\"/g, '"');
+ title = title.replace(//g, '>');
+
+ var html = '
';
+
+ tinyMCE.execCommand('mceInsertContent', false, html);
+ tinyMCEPopup.close();
+}
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/jscripts/index.html b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/jscripts/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/jscripts/index.html
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en.js
new file mode 100644
index 00000000..3cdd6751
--- /dev/null
+++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en.js
@@ -0,0 +1,22 @@
+// UK lang variables
+
+tinyMCE.addToLang('emotions',{
+title : 'Insert emotion',
+desc : 'Emotions',
+cool : 'Cool',
+cry : 'Cry',
+embarassed : 'Embarassed',
+foot_in_mouth : 'Foot in mouth',
+frown : 'Frown',
+innocent : 'Innocent',
+kiss : 'Kiss',
+laughing : 'Laughing',
+money_mouth : 'Money mouth',
+sealed : 'Sealed',
+smile : 'Smile',
+surprised : 'Surprised',
+tongue_out : 'Tongue out',
+undecided : 'Undecided',
+wink : 'Wink',
+yell : 'Yell'
+});
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js
new file mode 100644
index 00000000..3b57ad9e
--- /dev/null
+++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js
@@ -0,0 +1,20 @@
+tinyMCE.addI18n('en.emotions_dlg',{
+title:"Insert emotion",
+desc:"Emotions",
+cool:"Cool",
+cry:"Cry",
+embarassed:"Embarassed",
+foot_in_mouth:"Foot in mouth",
+frown:"Frown",
+innocent:"Innocent",
+kiss:"Kiss",
+laughing:"Laughing",
+money_mouth:"Money mouth",
+sealed:"Sealed",
+smile:"Smile",
+surprised:"Surprised",
+tongue_out:"Tongue out",
+undecided:"Undecided",
+wink:"Wink",
+yell:"Yell"
+});
\ No newline at end of file
diff --git a/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/langs/index.html b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/langs/index.html
new file mode 100644
index 00000000..fa6d84e8
--- /dev/null
+++ b/oss/joomla/trunk/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/langs/index.html
@@ -0,0 +1 @@
+
\ No newline at end of file