* Upgraded TinyMCE to version 2.0RC3. This fixes a conflict with

[citadel.git] / webcit / tiny_mce / plugins / table / editor_plugin_src.js

diff --git a/webcit/tiny_mce/plugins/table/editor_plugin_src.js b/webcit/tiny_mce/plugins/table/editor_plugin_src.js
index 26ccb1b25c86361a6f5da3d1a755ace31cc35d4c..8ad5fb2ec5a44836ec6269b1f1251e6116315cf0 100644 (file)
--- a/webcit/tiny_mce/plugins/table/editor_plugin_src.js
+++ b/webcit/tiny_mce/plugins/table/editor_plugin_src.js
@@ -1,5 +1,5 @@
 /* Import plugin specific language pack */
-tinyMCE.importPluginLanguagePack('table', 'en,ar,cs,da,de,el,es,fi,fr_ca,hu,it,ja,ko,nl,no,pl,pt,sv,tw,zh_cn,fr,de');
+tinyMCE.importPluginLanguagePack('table', 'en,ar,cs,da,de,el,es,fi,fr_ca,hu,it,ja,ko,nl,no,pl,pt,sv,tw,zh_cn,fr,de,he,no');
 
 function TinyMCE_table_getInfo() {
        return {
@@ -63,9 +63,9 @@ function TinyMCE_table_getControlHTML(control_name) {
                var but = controls[i];
 
                if (but[0] == control_name && (tinyMCE.isMSIE || !tinyMCE.settings['button_tile_map']))
-                       return '<a href="javascript:tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + but[3] + '\', ' + (but.length > 4 ? but[4] : false) + (but.length > 5 ? ', \'' + but[5] + '\'' : '') + ');" onmousedown="return false;"><img id="{$editor_id}_' + but[0] + '" src="{$pluginurl}/images/' + but[1] + '" title="' + but[2] + '" width="20" height="20" class="mceButtonDisabled" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" /></a>';
+                       return '<a href="javascript:tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + but[3] + '\', ' + (but.length > 4 ? but[4] : false) + (but.length > 5 ? ', \'' + but[5] + '\'' : '') + ');" target="_self" onmousedown="return false;"><img id="{$editor_id}_' + but[0] + '" src="{$pluginurl}/images/' + but[1] + '" title="' + but[2] + '" width="20" height="20" class="mceButtonDisabled" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" /></a>';
                else if (but[0] == control_name)
-                       return '<a href="javascript:tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + but[3] + '\', ' + (but.length > 4 ? but[4] : false) + (but.length > 5 ? ', \'' + but[5] + '\'' : '') + ');" onmousedown="return false;"><img id="{$editor_id}_' + but[0] + '" src="{$themeurl}/images/spacer.gif" style="background-image:url({$pluginurl}/images/buttons.gif); background-position: ' + (0-(i*20)) + 'px 0px" title="' + but[2] + '" width="20" height="20" class="mceButtonDisabled" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" /></a>';
+                       return '<a href="javascript:tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + but[3] + '\', ' + (but.length > 4 ? but[4] : false) + (but.length > 5 ? ', \'' + but[5] + '\'' : '') + ');" target="_self" onmousedown="return false;"><img id="{$editor_id}_' + but[0] + '" src="{$themeurl}/images/spacer.gif" style="background-image:url({$pluginurl}/images/buttons.gif); background-position: ' + (0-(i*20)) + 'px 0px" title="' + but[2] + '" width="20" height="20" class="mceButtonDisabled" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" /></a>';
        }
 
        // Special tablecontrols
@@ -413,8 +413,8 @@ function TinyMCE_table_doExecCommand(editor_id, element, command, user_interface
                                template['height'] = 295;
 
                                // Language specific width and height addons
-                               template['width'] += tinyMCE.getLang('lang_insert_table_delta_width', 0);
-                               template['height'] += tinyMCE.getLang('lang_insert_table_delta_height', 0);
+                               template['width'] += tinyMCE.getLang('lang_table_table_delta_width', 0);
+                               template['height'] += tinyMCE.getLang('lang_table_table_delta_height', 0);
 
                                // Open window
                                tinyMCE.openWindow(template, {editor_id : inst.editorId, inline : "yes", action : value});
@@ -773,7 +773,7 @@ function TinyMCE_table_doExecCommand(editor_id, element, command, user_interface
 
                                                        // Language specific width and height addons
                                                        template['width'] += tinyMCE.getLang('lang_table_merge_cells_delta_width', 0);
-                                                       template['height'] += tinyMCE.getLang('lang_table_merge_cells_height', 0);
+                                                       template['height'] += tinyMCE.getLang('lang_table_merge_cells_delta_height', 0);
 
                                                        // Open window
                                                        tinyMCE.openWindow(template, {editor_id : inst.editorId, inline : "yes", action : "update", numcols : sp.colspan, numrows : sp.rowspan});