From d9344fc349e8c5765898c90bf5061e56cd21c8a0 Mon Sep 17 00:00:00 2001 From: svncommit Date: Tue, 15 Apr 2008 21:22:00 +0000 Subject: HTML editing fixes, upgrade to TinyMCE v3.0.6 --- .../js/tiny_mce/plugins/emotions/editor_plugin.js | 2 +- .../tiny_mce/plugins/emotions/editor_plugin_src.js | 89 ++++++++------------- program/js/tiny_mce/plugins/emotions/emotions.htm | 43 +++++----- .../tiny_mce/plugins/emotions/images/emotions.gif | Bin 319 -> 0 bytes .../js/tiny_mce/plugins/emotions/images/readme.txt | 2 - .../plugins/emotions/images/smiley-cool.gif | Bin 354 -> 0 bytes .../plugins/emotions/images/smiley-cry.gif | Bin 329 -> 0 bytes .../plugins/emotions/images/smiley-embarassed.gif | Bin 331 -> 0 bytes .../emotions/images/smiley-foot-in-mouth.gif | Bin 344 -> 0 bytes .../plugins/emotions/images/smiley-frown.gif | Bin 340 -> 0 bytes .../plugins/emotions/images/smiley-innocent.gif | Bin 336 -> 0 bytes .../plugins/emotions/images/smiley-kiss.gif | Bin 338 -> 0 bytes .../plugins/emotions/images/smiley-laughing.gif | Bin 344 -> 0 bytes .../plugins/emotions/images/smiley-money-mouth.gif | Bin 321 -> 0 bytes .../plugins/emotions/images/smiley-sealed.gif | Bin 325 -> 0 bytes .../plugins/emotions/images/smiley-smile.gif | Bin 345 -> 0 bytes .../plugins/emotions/images/smiley-surprised.gif | Bin 342 -> 0 bytes .../plugins/emotions/images/smiley-tongue-out.gif | Bin 328 -> 0 bytes .../plugins/emotions/images/smiley-undecided.gif | Bin 337 -> 0 bytes .../plugins/emotions/images/smiley-wink.gif | Bin 351 -> 0 bytes .../plugins/emotions/images/smiley-yell.gif | Bin 336 -> 0 bytes .../tiny_mce/plugins/emotions/img/smiley-cool.gif | Bin 0 -> 354 bytes .../tiny_mce/plugins/emotions/img/smiley-cry.gif | Bin 0 -> 329 bytes .../plugins/emotions/img/smiley-embarassed.gif | Bin 0 -> 331 bytes .../plugins/emotions/img/smiley-foot-in-mouth.gif | Bin 0 -> 344 bytes .../tiny_mce/plugins/emotions/img/smiley-frown.gif | Bin 0 -> 340 bytes .../plugins/emotions/img/smiley-innocent.gif | Bin 0 -> 336 bytes .../tiny_mce/plugins/emotions/img/smiley-kiss.gif | Bin 0 -> 338 bytes .../plugins/emotions/img/smiley-laughing.gif | Bin 0 -> 344 bytes .../plugins/emotions/img/smiley-money-mouth.gif | Bin 0 -> 321 bytes .../plugins/emotions/img/smiley-sealed.gif | Bin 0 -> 325 bytes .../tiny_mce/plugins/emotions/img/smiley-smile.gif | Bin 0 -> 345 bytes .../plugins/emotions/img/smiley-surprised.gif | Bin 0 -> 342 bytes .../plugins/emotions/img/smiley-tongue-out.gif | Bin 0 -> 328 bytes .../plugins/emotions/img/smiley-undecided.gif | Bin 0 -> 337 bytes .../tiny_mce/plugins/emotions/img/smiley-wink.gif | Bin 0 -> 351 bytes .../tiny_mce/plugins/emotions/img/smiley-yell.gif | Bin 0 -> 336 bytes .../js/tiny_mce/plugins/emotions/js/emotions.js | 22 +++++ .../plugins/emotions/jscripts/functions.js | 21 ----- program/js/tiny_mce/plugins/emotions/langs/en.js | 22 ----- .../js/tiny_mce/plugins/emotions/langs/en_dlg.js | 20 +++++ program/js/tiny_mce/plugins/emotions/readme.txt | 1 - 42 files changed, 98 insertions(+), 124 deletions(-) delete mode 100644 program/js/tiny_mce/plugins/emotions/images/emotions.gif delete mode 100644 program/js/tiny_mce/plugins/emotions/images/readme.txt delete mode 100644 program/js/tiny_mce/plugins/emotions/images/smiley-cool.gif delete mode 100644 program/js/tiny_mce/plugins/emotions/images/smiley-cry.gif delete mode 100644 program/js/tiny_mce/plugins/emotions/images/smiley-embarassed.gif delete mode 100644 program/js/tiny_mce/plugins/emotions/images/smiley-foot-in-mouth.gif delete mode 100644 program/js/tiny_mce/plugins/emotions/images/smiley-frown.gif delete mode 100644 program/js/tiny_mce/plugins/emotions/images/smiley-innocent.gif delete mode 100644 program/js/tiny_mce/plugins/emotions/images/smiley-kiss.gif delete mode 100644 program/js/tiny_mce/plugins/emotions/images/smiley-laughing.gif delete mode 100644 program/js/tiny_mce/plugins/emotions/images/smiley-money-mouth.gif delete mode 100644 program/js/tiny_mce/plugins/emotions/images/smiley-sealed.gif delete mode 100644 program/js/tiny_mce/plugins/emotions/images/smiley-smile.gif delete mode 100644 program/js/tiny_mce/plugins/emotions/images/smiley-surprised.gif delete mode 100644 program/js/tiny_mce/plugins/emotions/images/smiley-tongue-out.gif delete mode 100644 program/js/tiny_mce/plugins/emotions/images/smiley-undecided.gif delete mode 100644 program/js/tiny_mce/plugins/emotions/images/smiley-wink.gif delete mode 100644 program/js/tiny_mce/plugins/emotions/images/smiley-yell.gif create mode 100644 program/js/tiny_mce/plugins/emotions/img/smiley-cool.gif create mode 100644 program/js/tiny_mce/plugins/emotions/img/smiley-cry.gif create mode 100644 program/js/tiny_mce/plugins/emotions/img/smiley-embarassed.gif create mode 100644 program/js/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif create mode 100644 program/js/tiny_mce/plugins/emotions/img/smiley-frown.gif create mode 100644 program/js/tiny_mce/plugins/emotions/img/smiley-innocent.gif create mode 100644 program/js/tiny_mce/plugins/emotions/img/smiley-kiss.gif create mode 100644 program/js/tiny_mce/plugins/emotions/img/smiley-laughing.gif create mode 100644 program/js/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif create mode 100644 program/js/tiny_mce/plugins/emotions/img/smiley-sealed.gif create mode 100644 program/js/tiny_mce/plugins/emotions/img/smiley-smile.gif create mode 100644 program/js/tiny_mce/plugins/emotions/img/smiley-surprised.gif create mode 100644 program/js/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif create mode 100644 program/js/tiny_mce/plugins/emotions/img/smiley-undecided.gif create mode 100644 program/js/tiny_mce/plugins/emotions/img/smiley-wink.gif create mode 100644 program/js/tiny_mce/plugins/emotions/img/smiley-yell.gif create mode 100644 program/js/tiny_mce/plugins/emotions/js/emotions.js delete mode 100644 program/js/tiny_mce/plugins/emotions/jscripts/functions.js delete mode 100644 program/js/tiny_mce/plugins/emotions/langs/en.js create mode 100644 program/js/tiny_mce/plugins/emotions/langs/en_dlg.js delete mode 100644 program/js/tiny_mce/plugins/emotions/readme.txt (limited to 'program/js/tiny_mce/plugins/emotions') 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 @@ + - {$lang_emotions_title} - - + {#emotions_dlg.title} + + - +
-
{$lang_emotions_title}:

+
{#emotions_dlg.title}:

- - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + +
{$lang_emotions_cool}{$lang_emotions_cry}{$lang_emotions_embarassed}{$lang_emotions_foot_in_mouth}{#emotions_dlg.cool}{#emotions_dlg.cry}{#emotions_dlg.embarassed}{#emotions_dlg.foot_in_mouth}
{$lang_emotions_frown}{$lang_emotions_innocent}{$lang_emotions_kiss}{$lang_emotions_laughing}{#emotions_dlg.frown}{#emotions_dlg.innocent}{#emotions_dlg.kiss}{#emotions_dlg.laughing}
{$lang_emotions_money_mouth}{$lang_emotions_sealed}{$lang_emotions_smile}{$lang_emotions_surprised}{#emotions_dlg.money_mouth}{#emotions_dlg.sealed}{#emotions_dlg.smile}{#emotions_dlg.surprised}
{$lang_emotions_tongue-out}{$lang_emotions_undecided}{$lang_emotions_wink}{$lang_emotions_yell}{#emotions_dlg.tongue-out}{#emotions_dlg.undecided}{#emotions_dlg.wink}{#emotions_dlg.yell}
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 Binary files a/program/js/tiny_mce/plugins/emotions/images/emotions.gif and /dev/null differ 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/images/smiley-cool.gif deleted file mode 100644 index ba90cc36f..000000000 Binary files a/program/js/tiny_mce/plugins/emotions/images/smiley-cool.gif and /dev/null differ diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-cry.gif b/program/js/tiny_mce/plugins/emotions/images/smiley-cry.gif deleted file mode 100644 index 74d897a4f..000000000 Binary files a/program/js/tiny_mce/plugins/emotions/images/smiley-cry.gif and /dev/null differ diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-embarassed.gif b/program/js/tiny_mce/plugins/emotions/images/smiley-embarassed.gif deleted file mode 100644 index 963a96b8a..000000000 Binary files a/program/js/tiny_mce/plugins/emotions/images/smiley-embarassed.gif and /dev/null differ diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-foot-in-mouth.gif b/program/js/tiny_mce/plugins/emotions/images/smiley-foot-in-mouth.gif deleted file mode 100644 index 16f68cc1e..000000000 Binary files a/program/js/tiny_mce/plugins/emotions/images/smiley-foot-in-mouth.gif and /dev/null differ diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-frown.gif b/program/js/tiny_mce/plugins/emotions/images/smiley-frown.gif deleted file mode 100644 index 716f55e16..000000000 Binary files a/program/js/tiny_mce/plugins/emotions/images/smiley-frown.gif and /dev/null differ diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-innocent.gif b/program/js/tiny_mce/plugins/emotions/images/smiley-innocent.gif deleted file mode 100644 index 334d49e0e..000000000 Binary files a/program/js/tiny_mce/plugins/emotions/images/smiley-innocent.gif and /dev/null differ diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-kiss.gif b/program/js/tiny_mce/plugins/emotions/images/smiley-kiss.gif deleted file mode 100644 index 4efd549ed..000000000 Binary files a/program/js/tiny_mce/plugins/emotions/images/smiley-kiss.gif and /dev/null differ diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-laughing.gif b/program/js/tiny_mce/plugins/emotions/images/smiley-laughing.gif deleted file mode 100644 index 1606c119e..000000000 Binary files a/program/js/tiny_mce/plugins/emotions/images/smiley-laughing.gif and /dev/null differ diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-money-mouth.gif b/program/js/tiny_mce/plugins/emotions/images/smiley-money-mouth.gif deleted file mode 100644 index ca2451e10..000000000 Binary files a/program/js/tiny_mce/plugins/emotions/images/smiley-money-mouth.gif and /dev/null differ diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-sealed.gif b/program/js/tiny_mce/plugins/emotions/images/smiley-sealed.gif deleted file mode 100644 index b33d3cca1..000000000 Binary files a/program/js/tiny_mce/plugins/emotions/images/smiley-sealed.gif and /dev/null differ diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-smile.gif b/program/js/tiny_mce/plugins/emotions/images/smiley-smile.gif deleted file mode 100644 index e6a9e60d5..000000000 Binary files a/program/js/tiny_mce/plugins/emotions/images/smiley-smile.gif and /dev/null differ diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-surprised.gif b/program/js/tiny_mce/plugins/emotions/images/smiley-surprised.gif deleted file mode 100644 index cb99cdd91..000000000 Binary files a/program/js/tiny_mce/plugins/emotions/images/smiley-surprised.gif and /dev/null differ diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-tongue-out.gif b/program/js/tiny_mce/plugins/emotions/images/smiley-tongue-out.gif deleted file mode 100644 index 2075dc160..000000000 Binary files a/program/js/tiny_mce/plugins/emotions/images/smiley-tongue-out.gif and /dev/null differ diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-undecided.gif b/program/js/tiny_mce/plugins/emotions/images/smiley-undecided.gif deleted file mode 100644 index bef7e2573..000000000 Binary files a/program/js/tiny_mce/plugins/emotions/images/smiley-undecided.gif and /dev/null differ diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-wink.gif b/program/js/tiny_mce/plugins/emotions/images/smiley-wink.gif deleted file mode 100644 index 9faf1aff8..000000000 Binary files a/program/js/tiny_mce/plugins/emotions/images/smiley-wink.gif and /dev/null differ diff --git a/program/js/tiny_mce/plugins/emotions/images/smiley-yell.gif b/program/js/tiny_mce/plugins/emotions/images/smiley-yell.gif deleted file mode 100644 index 648e6e879..000000000 Binary files a/program/js/tiny_mce/plugins/emotions/images/smiley-yell.gif and /dev/null differ diff --git a/program/js/tiny_mce/plugins/emotions/img/smiley-cool.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-cool.gif new file mode 100644 index 000000000..ba90cc36f Binary files /dev/null and b/program/js/tiny_mce/plugins/emotions/img/smiley-cool.gif differ diff --git a/program/js/tiny_mce/plugins/emotions/img/smiley-cry.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-cry.gif new file mode 100644 index 000000000..74d897a4f Binary files /dev/null and b/program/js/tiny_mce/plugins/emotions/img/smiley-cry.gif differ diff --git a/program/js/tiny_mce/plugins/emotions/img/smiley-embarassed.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-embarassed.gif new file mode 100644 index 000000000..963a96b8a Binary files /dev/null and b/program/js/tiny_mce/plugins/emotions/img/smiley-embarassed.gif differ diff --git a/program/js/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif new file mode 100644 index 000000000..16f68cc1e Binary files /dev/null and b/program/js/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif differ diff --git a/program/js/tiny_mce/plugins/emotions/img/smiley-frown.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-frown.gif new file mode 100644 index 000000000..716f55e16 Binary files /dev/null and b/program/js/tiny_mce/plugins/emotions/img/smiley-frown.gif differ diff --git a/program/js/tiny_mce/plugins/emotions/img/smiley-innocent.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-innocent.gif new file mode 100644 index 000000000..334d49e0e Binary files /dev/null and b/program/js/tiny_mce/plugins/emotions/img/smiley-innocent.gif differ diff --git a/program/js/tiny_mce/plugins/emotions/img/smiley-kiss.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-kiss.gif new file mode 100644 index 000000000..4efd549ed Binary files /dev/null and b/program/js/tiny_mce/plugins/emotions/img/smiley-kiss.gif differ diff --git a/program/js/tiny_mce/plugins/emotions/img/smiley-laughing.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-laughing.gif new file mode 100644 index 000000000..1606c119e Binary files /dev/null and b/program/js/tiny_mce/plugins/emotions/img/smiley-laughing.gif differ diff --git a/program/js/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif new file mode 100644 index 000000000..ca2451e10 Binary files /dev/null and b/program/js/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif differ diff --git a/program/js/tiny_mce/plugins/emotions/img/smiley-sealed.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-sealed.gif new file mode 100644 index 000000000..b33d3cca1 Binary files /dev/null and b/program/js/tiny_mce/plugins/emotions/img/smiley-sealed.gif differ diff --git a/program/js/tiny_mce/plugins/emotions/img/smiley-smile.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-smile.gif new file mode 100644 index 000000000..e6a9e60d5 Binary files /dev/null and b/program/js/tiny_mce/plugins/emotions/img/smiley-smile.gif differ diff --git a/program/js/tiny_mce/plugins/emotions/img/smiley-surprised.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-surprised.gif new file mode 100644 index 000000000..cb99cdd91 Binary files /dev/null and b/program/js/tiny_mce/plugins/emotions/img/smiley-surprised.gif differ diff --git a/program/js/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif new file mode 100644 index 000000000..2075dc160 Binary files /dev/null and b/program/js/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif differ diff --git a/program/js/tiny_mce/plugins/emotions/img/smiley-undecided.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-undecided.gif new file mode 100644 index 000000000..bef7e2573 Binary files /dev/null and b/program/js/tiny_mce/plugins/emotions/img/smiley-undecided.gif differ diff --git a/program/js/tiny_mce/plugins/emotions/img/smiley-wink.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-wink.gif new file mode 100644 index 000000000..9faf1aff8 Binary files /dev/null and b/program/js/tiny_mce/plugins/emotions/img/smiley-wink.gif differ diff --git a/program/js/tiny_mce/plugins/emotions/img/smiley-yell.gif b/program/js/tiny_mce/plugins/emotions/img/smiley-yell.gif new file mode 100644 index 000000000..648e6e879 Binary files /dev/null and b/program/js/tiny_mce/plugins/emotions/img/smiley-yell.gif differ 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, '&'); - title = title.replace(/\"/g, '"'); - title = title.replace(//g, '>'); - - var html = '' + 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. -- cgit v1.2.3