21 files changed, 2 insertions, 3 deletions
diff --git a/public/javascripts/tiny_mce/plugins/emotions/editor_plugin.js b/public/javascripts/tiny_mce/plugins/emotions/editor_plugin.js
index 87fac10..4783bc3 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/editor_plugin.js
+++ b/public/javascripts/tiny_mce/plugins/emotions/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create('tinymce.plugins.EmotionsPlugin',{init:function(ed,url){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});});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};}});tinymce.PluginManager.add('emotions',tinymce.plugins.EmotionsPlugin);})();
-\ No newline at end of file
+(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/public/javascripts/tiny_mce/plugins/emotions/editor_plugin_src.js b/public/javascripts/tiny_mce/plugins/emotions/editor_plugin_src.js
index df0d370..df0d370 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/editor_plugin_src.js
+++ b/public/javascripts/tiny_mce/plugins/emotions/editor_plugin_src.js
diff --git a/public/javascripts/tiny_mce/plugins/emotions/emotions.htm b/public/javascripts/tiny_mce/plugins/emotions/emotions.htm
index 8110ee0..55a1d72 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/emotions.htm
+++ b/public/javascripts/tiny_mce/plugins/emotions/emotions.htm
@@ -1,10 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
        <title>{#emotions_dlg.title}</title>
        <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
        <script type="text/javascript" src="js/emotions.js"></script>
-        <base target="_self" />
 </head>
 <body style="display: none">
        <div align="center">
diff --git a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-cool.gif b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-cool.gif
index ba90cc3..ba90cc3 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-cool.gif
+++ b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-cool.gif
Binary files differ
diff --git a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-cry.gif b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-cry.gif
index 74d897a..74d897a 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-cry.gif
+++ b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-cry.gif
Binary files differ
diff --git a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
index 963a96b..963a96b 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
+++ b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
Binary files differ
diff --git a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
index 16f68cc..16f68cc 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
+++ b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
Binary files differ
diff --git a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-frown.gif b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-frown.gif
index 716f55e..716f55e 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-frown.gif
+++ b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-frown.gif
Binary files differ
diff --git a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif
index 334d49e..334d49e 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif
+++ b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif
Binary files differ
diff --git a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif
index 4efd549..4efd549 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif
+++ b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif
Binary files differ
diff --git a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif
index 1606c11..1606c11 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif
+++ b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif
Binary files differ
diff --git a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
index ca2451e..ca2451e 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
+++ b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
Binary files differ
diff --git a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif
index b33d3cc..b33d3cc 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif
+++ b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif
Binary files differ
diff --git a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-smile.gif b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-smile.gif
index e6a9e60..e6a9e60 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-smile.gif
+++ b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-smile.gif
Binary files differ
diff --git a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif
index cb99cdd..cb99cdd 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif
+++ b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif
Binary files differ
diff --git a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
index 2075dc1..2075dc1 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
+++ b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
Binary files differ
diff --git a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif
index bef7e25..bef7e25 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif
+++ b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif
Binary files differ
diff --git a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-wink.gif b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-wink.gif
index 9faf1af..9faf1af 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-wink.gif
+++ b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-wink.gif
Binary files differ
diff --git a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-yell.gif b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-yell.gif
index 648e6e8..648e6e8 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/img/smiley-yell.gif
+++ b/public/javascripts/tiny_mce/plugins/emotions/img/smiley-yell.gif
Binary files differ
diff --git a/public/javascripts/tiny_mce/plugins/emotions/js/emotions.js b/public/javascripts/tiny_mce/plugins/emotions/js/emotions.js
index c549367..c549367 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/js/emotions.js
+++ b/public/javascripts/tiny_mce/plugins/emotions/js/emotions.js
diff --git a/public/javascripts/tiny_mce/plugins/emotions/langs/en_dlg.js b/public/javascripts/tiny_mce/plugins/emotions/langs/en_dlg.js
index 3b57ad9..3b57ad9 100755..100644
--- a/public/javascripts/tiny_mce/plugins/emotions/langs/en_dlg.js
+++ b/public/javascripts/tiny_mce/plugins/emotions/langs/en_dlg.js