HTML editing fixes, upgrade to TinyMCE v3.0.6

26 files changed, 98 insertions, 124 deletions

diff --git a/program/js/tiny_mce/plugins/emotions/editor_plugin.js b/program/js/tiny_mce/plugins/emotions/editor_plugin.js
index 4d81e5a86..87fac106d 100644
--- a/program/js/tiny_mce/plugins/emotions/editor_plugin.js
+++ b/program/js/tiny_mce/plugins/emotions/editor_plugin.js
@@ -1 +1 @@
-tinyMCE.importPluginLanguagePack('emotions');var TinyMCE_EmotionsPlugin={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}},getControlHTML:function(cn){switch(cn){case"emotions":return tinyMCE.getButtonHTML(cn,'lang_emotions_desc','{$pluginurl}/images/emotions.gif','mceEmotion')}return""},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceEmotion":var template=new Array();template['file']='../../plugins/emotions/emotions.htm';template['width']=250;template['height']=160;template['width']+=tinyMCE.getLang('lang_emotions_delta_width',0);template['height']+=tinyMCE.getLang('lang_emotions_delta_height',0);tinyMCE.openWindow(template,{editor_id:editor_id,inline:"yes"});return true}return false}};tinyMCE.addPlugin('emotions',TinyMCE_EmotionsPlugin);
\ No newline at end of file
+(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
diff --git a/program/js/tiny_mce/plugins/emotions/editor_plugin_src.js b/program/js/tiny_mce/plugins/emotions/editor_plugin_src.js
index c7d60cf3f..df0d370ae 100644
--- a/program/js/tiny_mce/plugins/emotions/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/emotions/editor_plugin_src.js
@@ -1,63 +1,40 @@
 /**

- * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $

+ * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $

  *

  * @author Moxiecode

- * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.

+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.

  */

 

-/* Import plugin specific language pack */

-tinyMCE.importPluginLanguagePack('emotions');

-

-// Plucin static class

-var TinyMCE_EmotionsPlugin = {

-	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

-		};

-	},

-

-	/**

-	 * Returns the HTML contents of the emotions control.

-	 */

-	getControlHTML : function(cn) {

-		switch (cn) {

-			case "emotions":

-				return tinyMCE.getButtonHTML(cn, 'lang_emotions_desc', '{$pluginurl}/images/emotions.gif', 'mceEmotion');

-		}

-

-		return "";

-	},

-

-	/**

-	 * Executes the mceEmotion command.

-	 */

-	execCommand : function(editor_id, element, command, user_interface, value) {

-		// Handle commands

-		switch (command) {

-			case "mceEmotion":

-				var template = new Array();

-

-				template['file'] = '../../plugins/emotions/emotions.htm'; // Relative to theme

-				template['width'] = 250;

-				template['height'] = 160;

-

-				// Language specific width and height addons

-				template['width'] += tinyMCE.getLang('lang_emotions_delta_width', 0);

-				template['height'] += tinyMCE.getLang('lang_emotions_delta_height', 0);

-

-				tinyMCE.openWindow(template, {editor_id : editor_id, inline : "yes"});

-

-				return true;

+(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

+			};

 		}

+	});

 

-		// Pass to next handler in chain

-		return false;

-	}

-};

-

-// Register plugin

-tinyMCE.addPlugin('emotions', TinyMCE_EmotionsPlugin);

+	// Register plugin

+	tinymce.PluginManager.add('emotions', tinymce.plugins.EmotionsPlugin);

+})();
\ No newline at end of file
diff --git a/program/js/tiny_mce/plugins/emotions/emotions.htm b/program/js/tiny_mce/plugins/emotions/emotions.htm
index fca8ffa08..8110ee029 100644
--- a/program/js/tiny_mce/plugins/emotions/emotions.htm
+++ b/program/js/tiny_mce/plugins/emotions/emotions.htm
@@ -1,38 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

 <html xmlns="http://www.w3.org/1999/xhtml">

 <head>

-	<title>{$lang_emotions_title}</title>

-	<script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>

-	<script language="javascript" type="text/javascript" src="jscripts/functions.js"></script>

+	<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 onload="tinyMCEPopup.executeOnLoad('init();');" style="display: none">

+<body style="display: none">

 	<div align="center">

-		<div class="title">{$lang_emotions_title}:<br /><br /></div>

+		<div class="title">{#emotions_dlg.title}:<br /><br /></div>

 

 		<table border="0" cellspacing="0" cellpadding="4">

 		  <tr>

-			<td><a href="javascript:insertEmotion('smiley-cool.gif','lang_emotions_cool');"><img src="images/smiley-cool.gif" width="18" height="18" border="0" alt="{$lang_emotions_cool}" title="{$lang_emotions_cool}" /></a></td>

-			<td><a href="javascript:insertEmotion('smiley-cry.gif','lang_emotions_cry');"><img src="images/smiley-cry.gif" width="18" height="18" border="0" alt="{$lang_emotions_cry}" title="{$lang_emotions_cry}" /></a></td>

-			<td><a href="javascript:insertEmotion('smiley-embarassed.gif','lang_emotions_embarassed');"><img src="images/smiley-embarassed.gif" width="18" height="18" border="0" alt="{$lang_emotions_embarassed}" title="{$lang_emotions_embarassed}" /></a></td>

-			<td><a href="javascript:insertEmotion('smiley-foot-in-mouth.gif','lang_emotions_foot_in_mouth');"><img src="images/smiley-foot-in-mouth.gif" width="18" height="18" border="0" alt="{$lang_emotions_foot_in_mouth}" title="{$lang_emotions_foot_in_mouth}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-cool.gif','emotions_dlg.cool');"><img src="img/smiley-cool.gif" width="18" height="18" border="0" alt="{#emotions_dlg.cool}" title="{#emotions_dlg.cool}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-cry.gif','emotions_dlg.cry');"><img src="img/smiley-cry.gif" width="18" height="18" border="0" alt="{#emotions_dlg.cry}" title="{#emotions_dlg.cry}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-embarassed.gif','emotions_dlg.embarassed');"><img src="img/smiley-embarassed.gif" width="18" height="18" border="0" alt="{#emotions_dlg.embarassed}" title="{#emotions_dlg.embarassed}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-foot-in-mouth.gif','emotions_dlg.foot_in_mouth');"><img src="img/smiley-foot-in-mouth.gif" width="18" height="18" border="0" alt="{#emotions_dlg.foot_in_mouth}" title="{#emotions_dlg.foot_in_mouth}" /></a></td>

 		  </tr>

 		  <tr>

-			<td><a href="javascript:insertEmotion('smiley-frown.gif','lang_emotions_frown');"><img src="images/smiley-frown.gif" width="18" height="18" border="0" alt="{$lang_emotions_frown}" title="{$lang_emotions_frown}" /></a></td>

-			<td><a href="javascript:insertEmotion('smiley-innocent.gif','lang_emotions_innocent');"><img src="images/smiley-innocent.gif" width="18" height="18" border="0" alt="{$lang_emotions_innocent}" title="{$lang_emotions_innocent}" /></a></td>

-			<td><a href="javascript:insertEmotion('smiley-kiss.gif','lang_emotions_kiss');"><img src="images/smiley-kiss.gif" width="18" height="18" border="0" alt="{$lang_emotions_kiss}" title="{$lang_emotions_kiss}" /></a></td>

-			<td><a href="javascript:insertEmotion('smiley-laughing.gif','lang_emotions_laughing');"><img src="images/smiley-laughing.gif" width="18" height="18" border="0" alt="{$lang_emotions_laughing}" title="{$lang_emotions_laughing}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-frown.gif','emotions_dlg.frown');"><img src="img/smiley-frown.gif" width="18" height="18" border="0" alt="{#emotions_dlg.frown}" title="{#emotions_dlg.frown}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-innocent.gif','emotions_dlg.innocent');"><img src="img/smiley-innocent.gif" width="18" height="18" border="0" alt="{#emotions_dlg.innocent}" title="{#emotions_dlg.innocent}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-kiss.gif','emotions_dlg.kiss');"><img src="img/smiley-kiss.gif" width="18" height="18" border="0" alt="{#emotions_dlg.kiss}" title="{#emotions_dlg.kiss}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-laughing.gif','emotions_dlg.laughing');"><img src="img/smiley-laughing.gif" width="18" height="18" border="0" alt="{#emotions_dlg.laughing}" title="{#emotions_dlg.laughing}" /></a></td>

 		  </tr>

 		  <tr>

-			<td><a href="javascript:insertEmotion('smiley-money-mouth.gif','lang_emotions_money_mouth');"><img src="images/smiley-money-mouth.gif" width="18" height="18" border="0" alt="{$lang_emotions_money_mouth}" title="{$lang_emotions_money_mouth}" /></a></td>

-			<td><a href="javascript:insertEmotion('smiley-sealed.gif','lang_emotions_sealed');"><img src="images/smiley-sealed.gif" width="18" height="18" border="0" alt="{$lang_emotions_sealed}" title="{$lang_emotions_sealed}" /></a></td>

-			<td><a href="javascript:insertEmotion('smiley-smile.gif','lang_emotions_smile');"><img src="images/smiley-smile.gif" width="18" height="18" border="0" alt="{$lang_emotions_smile}" title="{$lang_emotions_smile}" /></a></td>

-			<td><a href="javascript:insertEmotion('smiley-surprised.gif','lang_emotions_surprised');"><img src="images/smiley-surprised.gif" width="18" height="18" border="0" alt="{$lang_emotions_surprised}" title="{$lang_emotions_surprised}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-money-mouth.gif','emotions_dlg.money_mouth');"><img src="img/smiley-money-mouth.gif" width="18" height="18" border="0" alt="{#emotions_dlg.money_mouth}" title="{#emotions_dlg.money_mouth}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-sealed.gif','emotions_dlg.sealed');"><img src="img/smiley-sealed.gif" width="18" height="18" border="0" alt="{#emotions_dlg.sealed}" title="{#emotions_dlg.sealed}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-smile.gif','emotions_dlg.smile');"><img src="img/smiley-smile.gif" width="18" height="18" border="0" alt="{#emotions_dlg.smile}" title="{#emotions_dlg.smile}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-surprised.gif','emotions_dlg.surprised');"><img src="img/smiley-surprised.gif" width="18" height="18" border="0" alt="{#emotions_dlg.surprised}" title="{#emotions_dlg.surprised}" /></a></td>

 		  </tr>

 		  <tr>

-			<td><a href="javascript:insertEmotion('smiley-tongue-out.gif','lang_emotions_tongue_out');"><img src="images/smiley-tongue-out.gif" width="18" height="18" border="0" alt="{$lang_emotions_tongue-out}" title="{$lang_emotions_tongue_out}" /></a></td>

-			<td><a href="javascript:insertEmotion('smiley-undecided.gif','lang_emotions_undecided');"><img src="images/smiley-undecided.gif" width="18" height="18" border="0" alt="{$lang_emotions_undecided}" title="{$lang_emotions_undecided}" /></a></td>

-			<td><a href="javascript:insertEmotion('smiley-wink.gif','lang_emotions_wink');"><img src="images/smiley-wink.gif" width="18" height="18" border="0" alt="{$lang_emotions_wink}" title="{$lang_emotions_wink}" /></a></td>

-			<td><a href="javascript:insertEmotion('smiley-yell.gif','lang_emotions_yell');"><img src="images/smiley-yell.gif" width="18" height="18" border="0" alt="{$lang_emotions_yell}" title="{$lang_emotions_yell}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-tongue-out.gif','emotions_dlg.tongue_out');"><img src="img/smiley-tongue-out.gif" width="18" height="18" border="0" alt="{#emotions_dlg.tongue-out}" title="{#emotions_dlg.tongue_out}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-undecided.gif','emotions_dlg.undecided');"><img src="img/smiley-undecided.gif" width="18" height="18" border="0" alt="{#emotions_dlg.undecided}" title="{#emotions_dlg.undecided}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-wink.gif','emotions_dlg.wink');"><img src="img/smiley-wink.gif" width="18" height="18" border="0" alt="{#emotions_dlg.wink}" title="{#emotions_dlg.wink}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-yell.gif','emotions_dlg.yell');"><img src="img/smiley-yell.gif" width="18" height="18" border="0" alt="{#emotions_dlg.yell}" title="{#emotions_dlg.yell}" /></a></td>

 		  </tr>

 		</table>

 	</div>

diff --git a/program/js/tiny_mce/plugins/emotions/images/emotions.gif b/program/js/tiny_mce/plugins/emotions/images/emotions.gif
deleted file mode 100644
index a39ed8ec3..000000000
--- a/program/js/tiny_mce/plugins/emotions/images/emotions.gif
+++ /dev/null
diff --git a/program/js/tiny_mce/plugins/emotions/images/readme.txt b/program/js/tiny_mce/plugins/emotions/images/readme.txt
deleted file mode 100644
index a3cea1b68..000000000
--- a/program/js/tiny_mce/plugins/emotions/images/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-These emotions where taken from Mozilla Thunderbird.

-I hope they don't get angry if I use them here after all this is a open source project aswell.

diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-cool.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-cool.gif
index ba90cc36f..ba90cc36f 100644
--- a/program/js/tiny_mce/plugins/emotions/images/smiley-cool.gif
+++ b/program/js/tiny_mce/plugins/emotions/img/smiley-cool.gif
diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-cry.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-cry.gif
index 74d897a4f..74d897a4f 100644
--- a/program/js/tiny_mce/plugins/emotions/images/smiley-cry.gif
+++ b/program/js/tiny_mce/plugins/emotions/img/smiley-cry.gif
diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-embarassed.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
index 963a96b8a..963a96b8a 100644
--- a/program/js/tiny_mce/plugins/emotions/images/smiley-embarassed.gif
+++ b/program/js/tiny_mce/plugins/emotions/img/smiley-embarassed.gif
diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-foot-in-mouth.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
index 16f68cc1e..16f68cc1e 100644
--- a/program/js/tiny_mce/plugins/emotions/images/smiley-foot-in-mouth.gif
+++ b/program/js/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-frown.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-frown.gif
index 716f55e16..716f55e16 100644
--- a/program/js/tiny_mce/plugins/emotions/images/smiley-frown.gif
+++ b/program/js/tiny_mce/plugins/emotions/img/smiley-frown.gif
diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-innocent.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-innocent.gif
index 334d49e0e..334d49e0e 100644
--- a/program/js/tiny_mce/plugins/emotions/images/smiley-innocent.gif
+++ b/program/js/tiny_mce/plugins/emotions/img/smiley-innocent.gif
diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-kiss.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-kiss.gif
index 4efd549ed..4efd549ed 100644
--- a/program/js/tiny_mce/plugins/emotions/images/smiley-kiss.gif
+++ b/program/js/tiny_mce/plugins/emotions/img/smiley-kiss.gif
diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-laughing.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-laughing.gif
index 1606c119e..1606c119e 100644
--- a/program/js/tiny_mce/plugins/emotions/images/smiley-laughing.gif
+++ b/program/js/tiny_mce/plugins/emotions/img/smiley-laughing.gif
diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-money-mouth.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
index ca2451e10..ca2451e10 100644
--- a/program/js/tiny_mce/plugins/emotions/images/smiley-money-mouth.gif
+++ b/program/js/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif
diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-sealed.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-sealed.gif
index b33d3cca1..b33d3cca1 100644
--- a/program/js/tiny_mce/plugins/emotions/images/smiley-sealed.gif
+++ b/program/js/tiny_mce/plugins/emotions/img/smiley-sealed.gif
diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-smile.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-smile.gif
index e6a9e60d5..e6a9e60d5 100644
--- a/program/js/tiny_mce/plugins/emotions/images/smiley-smile.gif
+++ b/program/js/tiny_mce/plugins/emotions/img/smiley-smile.gif
diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-surprised.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-surprised.gif
index cb99cdd91..cb99cdd91 100644
--- a/program/js/tiny_mce/plugins/emotions/images/smiley-surprised.gif
+++ b/program/js/tiny_mce/plugins/emotions/img/smiley-surprised.gif
diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-tongue-out.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
index 2075dc160..2075dc160 100644
--- a/program/js/tiny_mce/plugins/emotions/images/smiley-tongue-out.gif
+++ b/program/js/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif
diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-undecided.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-undecided.gif
index bef7e2573..bef7e2573 100644
--- a/program/js/tiny_mce/plugins/emotions/images/smiley-undecided.gif
+++ b/program/js/tiny_mce/plugins/emotions/img/smiley-undecided.gif
diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-wink.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-wink.gif
index 9faf1aff8..9faf1aff8 100644
--- a/program/js/tiny_mce/plugins/emotions/images/smiley-wink.gif
+++ b/program/js/tiny_mce/plugins/emotions/img/smiley-wink.gif
diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-yell.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-yell.gif
index 648e6e879..648e6e879 100644
--- a/program/js/tiny_mce/plugins/emotions/images/smiley-yell.gif
+++ b/program/js/tiny_mce/plugins/emotions/img/smiley-yell.gif
diff --git a/program/js/tiny_mce/plugins/emotions/js/emotions.js b/program/js/tiny_mce/plugins/emotions/js/emotions.js
new file mode 100644
index 000000000..c54936709
--- /dev/null
+++ b/program/js/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/program/js/tiny_mce/plugins/emotions/jscripts/functions.js b/program/js/tiny_mce/plugins/emotions/jscripts/functions.js
deleted file mode 100644
index 95a9eafe8..000000000
--- a/program/js/tiny_mce/plugins/emotions/jscripts/functions.js
+++ /dev/null
@@ -1,21 +0,0 @@
-function init() {

-	tinyMCEPopup.resizeToInnerSize();

-}

-

-function insertEmotion(file_name, title) {

-	title = tinyMCE.getLang(title);

-

-	if (title == null)

-		title = "";

-

-	// XML encode

-	title = title.replace(/&/g, '&amp;');

-	title = title.replace(/\"/g, '&quot;');

-	title = title.replace(/</g, '&lt;');

-	title = title.replace(/>/g, '&gt;');

-

-	var html = '<img src="' + tinyMCE.baseURL + "/plugins/emotions/images/" + file_name + '" mce_src="' + tinyMCE.baseURL + "/plugins/emotions/images/" + file_name + '" border="0" alt="' + title + '" title="' + title + '" />';

-

-	tinyMCE.execCommand('mceInsertContent', false, html);

-	tinyMCEPopup.close();

-}

diff --git a/program/js/tiny_mce/plugins/emotions/langs/en.js b/program/js/tiny_mce/plugins/emotions/langs/en.js
deleted file mode 100644
index 3cdd67517..000000000
--- a/program/js/tiny_mce/plugins/emotions/langs/en.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// 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/program/js/tiny_mce/plugins/emotions/langs/en_dlg.js b/program/js/tiny_mce/plugins/emotions/langs/en_dlg.js
new file mode 100644
index 000000000..3b57ad9e3
--- /dev/null
+++ b/program/js/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/program/js/tiny_mce/plugins/emotions/readme.txt b/program/js/tiny_mce/plugins/emotions/readme.txt
deleted file mode 100644
index 4fdb78aec..000000000
--- a/program/js/tiny_mce/plugins/emotions/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Check the TinyMCE documentation for details on this plugin.