r991 - in xwiki/trunk/src/main/web: . tiny_mce tiny_mce/plugins tiny_mce/plugins/table tiny_mce/plugins/wiki_editor tiny_mce/themes tiny_mce/themes/wikieditor tiny_mce/themes/wikieditor/images tiny_mce/themes/wikieditor/langs wiki_editor wiki_editor/plugins wiki_editor/themes

Ludovic Dubost ludovic at users.forge.objectweb.org
Mon Mar 27 22:26:08 CEST 2006


Author: ludovic
Date: 2006-03-27 22:26:05 +0200 (Mon, 27 Mar 2006)
New Revision: 991

Added:
   xwiki/trunk/src/main/web/JSTrim.config
   xwiki/trunk/src/main/web/JSTrim.exe
   xwiki/trunk/src/main/web/JSTrim_mono.exe
   xwiki/trunk/src/main/web/tiny_mce/plugins/wiki_editor/
   xwiki/trunk/src/main/web/tiny_mce/plugins/wiki_editor/editor_plugin.js
   xwiki/trunk/src/main/web/tiny_mce/plugins/wiki_editor/editor_plugin_src.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/anchor.htm
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/attachment.htm
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/editor_content.css
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/editor_popup.css
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/editor_template.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/editor_ui.css
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/image.htm
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/Thumbs.db
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/anchor.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/attachment.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/backcolor.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/bold.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/bold_de_se.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/bold_fr.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/bold_ru.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/browse.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/bullist.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/buttons.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/center.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/charmap.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/cleanup.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/close.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/code.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/copy.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/custom_1.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/cut.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/forecolor.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/full.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/help.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/hr.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/image.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/indent.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/italic.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/italic_de_se.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/italic_ru.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/left.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/link.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/newdocument.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/numlist.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/outdent.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/paste.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/redo.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/removeformat.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/right.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/spacer.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/strikethrough.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/sub.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/sup.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/table.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/table_delete_col.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/table_delete_row.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/table_insert_col_after.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/table_insert_col_before.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/table_insert_row_after.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/table_insert_row_before.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/underline.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/underline_fr.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/underline_ru.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/undo.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/unlink.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/images/visualaid.gif
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/ar.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/ca.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/cs.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/da.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/de.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/el.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/en.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/es.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/fa.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/fi.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/fr.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/fr_ca.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/hu.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/it.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/ja.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/ko.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/nl.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/no.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/pl.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/pt.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/pt_br.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/readme.txt
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/sv.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/tw.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/langs/zh_cn.js
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/link.htm
   xwiki/trunk/src/main/web/tiny_mce/themes/wikieditor/source_editor.htm
   xwiki/trunk/src/main/web/wiki_editor/plugins/attachments_src.js
   xwiki/trunk/src/main/web/wiki_editor/plugins/core_src.js
   xwiki/trunk/src/main/web/wiki_editor/wiki_editor_src.js
Removed:
   xwiki/trunk/src/main/web/tiny_mce/bash.exe.stackdump
Modified:
   xwiki/trunk/src/main/web/tiny_mce/plugins/table/editor_plugin.js
   xwiki/trunk/src/main/web/tiny_mce/plugins/table/editor_plugin_src.js
   xwiki/trunk/src/main/web/tiny_mce/tiny_mce.js
   xwiki/trunk/src/main/web/tiny_mce/tiny_mce_src.js
   xwiki/trunk/src/main/web/wiki_editor/plugins/attachments.js
   xwiki/trunk/src/main/web/wiki_editor/plugins/core.js
   xwiki/trunk/src/main/web/wiki_editor/themes/default.js
   xwiki/trunk/src/main/web/wiki_editor/wiki_editor.js
Log:
New wiki wysiwyg editor
TinyMCE 2.0.4
Support for Tables
Fix for list items
Support for accents in ISO

Added: xwiki/trunk/src/main/web/JSTrim.config
===================================================================
--- xwiki/trunk/src/main/web/JSTrim.config	2006-03-27 19:44:45 UTC (rev 990)
+++ xwiki/trunk/src/main/web/JSTrim.config	2006-03-27 20:26:05 UTC (rev 991)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<jstrim>
+	<!-- Trim core script -->
+	<trim src="tiny_mce/tiny_mce_src.js" dest="tiny_mce/tiny_mce.js" />
+
+	<!-- Trim themes -->
+	<trim src="tiny_mce/themes/simple/editor_template_src.js" dest="tiny_mce/themes/simple/editor_template.js" />
+	<trim src="tiny_mce/themes/advanced/editor_template_src.js" dest="tiny_mce/themes/advanced/editor_template.js" />
+	<!-- <trim src="tiny_mce/themes/external/editor_template_src.js" dest="tiny_mce/themes/external/editor_template.js" /> -->
+
+	<!-- Trim plugins -->
+	<trim src="tiny_mce/plugins/advhr/editor_plugin_src.js" dest="tiny_mce/plugins/advhr/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/advimage/editor_plugin_src.js" dest="tiny_mce/plugins/advimage/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/advlink/editor_plugin_src.js" dest="tiny_mce/plugins/advlink/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/emotions/editor_plugin_src.js" dest="tiny_mce/plugins/emotions/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/flash/editor_plugin_src.js" dest="tiny_mce/plugins/flash/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/iespell/editor_plugin_src.js" dest="tiny_mce/plugins/iespell/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/insertdatetime/editor_plugin_src.js" dest="tiny_mce/plugins/insertdatetime/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/preview/editor_plugin_src.js" dest="tiny_mce/plugins/preview/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/print/editor_plugin_src.js" dest="tiny_mce/plugins/print/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/save/editor_plugin_src.js" dest="tiny_mce/plugins/save/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/searchreplace/editor_plugin_src.js" dest="tiny_mce/plugins/searchreplace/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/zoom/editor_plugin_src.js" dest="tiny_mce/plugins/zoom/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/table/editor_plugin_src.js" dest="tiny_mce/plugins/table/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/contextmenu/editor_plugin_src.js" dest="tiny_mce/plugins/contextmenu/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/paste/editor_plugin_src.js" dest="tiny_mce/plugins/paste/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/fullscreen/editor_plugin_src.js" dest="tiny_mce/plugins/fullscreen/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/directionality/editor_plugin_src.js" dest="tiny_mce/plugins/directionality/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/inlinepopups/editor_plugin_src.js" dest="tiny_mce/plugins/inlinepopups/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/autosave/editor_plugin_src.js" dest="tiny_mce/plugins/autosave/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/noneditable/editor_plugin_src.js" dest="tiny_mce/plugins/noneditable/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/fullpage/editor_plugin_src.js" dest="tiny_mce/plugins/fullpage/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/cleanup/editor_plugin_src.js" dest="tiny_mce/plugins/cleanup/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/_template/editor_plugin_src.js" dest="tiny_mce/plugins/_template/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/spellchecker/editor_plugin_src.js" dest="tiny_mce/plugins/spellchecker/editor_plugin.js" />
+	<trim src="tiny_mce/plugins/wiki_editor/editor_plugin_src.js" dest="tiny_mce/plugins/wiki_editor/editor_plugin.js" />
+
+	<!-- Trim wiki editor -->
+	<trim src="wiki_editor/wiki_editor_src.js" dest="wiki_editor/wiki_editor.js" />
+	<trim src="wiki_editor/plugins/core_src.js" dest="wiki_editor/plugins/core.js" />
+	<trim src="wiki_editor/plugins/attachments_src.js" dest="wiki_editor/plugins/attachments.js" />
+
+</jstrim>

Added: xwiki/trunk/src/main/web/JSTrim.exe
===================================================================
(Binary files differ)


Property changes on: xwiki/trunk/src/main/web/JSTrim.exe
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: xwiki/trunk/src/main/web/JSTrim_mono.exe
===================================================================
(Binary files differ)


Property changes on: xwiki/trunk/src/main/web/JSTrim_mono.exe
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: xwiki/trunk/src/main/web/tiny_mce/bash.exe.stackdump
===================================================================
--- xwiki/trunk/src/main/web/tiny_mce/bash.exe.stackdump	2006-03-27 19:44:45 UTC (rev 990)
+++ xwiki/trunk/src/main/web/tiny_mce/bash.exe.stackdump	2006-03-27 20:26:05 UTC (rev 991)
@@ -1,16 +0,0 @@
-Exception: STATUS_ILLEGAL_INSTRUCTION at eip=005BBAC0
-eax=6112F418 ebx=100101D0 ecx=6112F418 edx=00000000 esi=0022E9E4 edi=00000000
-ebp=0022E8A8 esp=0022E89C program=D:\tools\cygwin\bin\bash.exe, pid 5820, thread main
-cs=001B ds=0023 es=0023 fs=003B gs=0000 ss=0023
-Stack trace:
-Frame     Function  Args
-0022E8A8  005BBAC0  (00000678, 0000067C, 00456000, 00458290)
-0022EB28  61046783  (00000001, 0022EB48, 0022EB44, 0043C8C7)
-0022EB58  610844FF  (100179F0, 00000000, 00000018, 1002C780)
-0022EBF8  00410FA9  (10017EB0, 00000000, FFFFFFFF, FFFFFFFF)
-0022EC28  00412530  (10017EB0, 0042DB30, 0046EDD4, 00000003)
-0022EC58  00403999  (00000003, 00000001, 0046EDD4, 00401E54)
-0022EEF8  00402A8F  (00000003, 10010168, 10010090, 6111E673)
-0022EFD8  61004DD2  (0022EFF0, 77D40467, 77D19A18, FFFFFFFF)
-0022FF88  6100594F  (00000000, 00000000, 00000000, 00000000)
-End of stack trace

Modified: xwiki/trunk/src/main/web/tiny_mce/plugins/table/editor_plugin.js
===================================================================
--- xwiki/trunk/src/main/web/tiny_mce/plugins/table/editor_plugin.js	2006-03-27 19:44:45 UTC (rev 990)
+++ xwiki/trunk/src/main/web/tiny_mce/plugins/table/editor_plugin.js	2006-03-27 20:26:05 UTC (rev 991)
@@ -1 +1 @@
-tinyMCE.importPluginLanguagePack('table','en,tr,ar,cs,da,de,el,es,fi,fr_ca,hu,it,ja,ko,nl,nb,pl,pt,pt_br,sv,tw,zh_cn,fr,de,he,nb,ru,ru_KOI8-R,ru_UTF-8,nn,cy,is,zh_tw,zh_tw_utf8,sk');var TinyMCE_TablePlugin={getInfo:function(){return{longname:'Tables',author:'Moxiecode Systems',authorurl:'http://tinymce.moxiecode.com',infourl:'http://tinymce.moxiecode.com/tinymce/docs/plugin_table.html',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion};},initInstance:function(inst){if(tinyMCE.isGecko){var doc=inst.getDoc();tinyMCE.addEvent(doc,"mouseup",TinyMCE_TablePlugin._mouseDownHandler);}inst.tableRowClipboard=null;},getControlHTML:function(control_name){var controls=new Array(['table','table.gif','lang_table_desc','mceInsertTable',true],['delete_col','table_delete_col.gif','lang_table_delete_col_desc','mceTableDeleteCol'],['delete_row','table_delete_row.gif','lang_table_delete_row_desc','mceTableDeleteRow'],['col_after','table_insert_col_after.gif','lang_table_col_after_desc','mceTableInsertColAfter'],['col_before','table_insert_col_before.gif','lang_table_col_before_desc','mceTableInsertColBefore'],['row_after','table_insert_row_after.gif','lang_table_row_after_desc','mceTableInsertRowAfter'],['row_before','table_insert_row_before.gif','lang_table_row_before_desc','mceTableInsertRowBefore'],['row_props','table_row_props.gif','lang_table_row_desc','mceTableRowProps',true],['cell_props','table_cell_props.gif','lang_table_cell_desc','mceTableCellProps',true],['split_cells','table_split_cells.gif','lang_table_split_cells_desc','mceTableSplitCells',true],['merge_cells','table_merge_cells.gif','lang_table_merge_cells_desc','mceTableMergeCells',true]);for(var i=0;i<controls.length;i++){var but=controls[i];var cmd='tinyMCE.execInstanceCommand(\'{$editor_id}\',\''+but[3]+'\', '+(but.length>4?but[4]:false)+(but.length>5?', \''+but[5]+'\'':'')+');return false;';if(but[0]==control_name)return tinyMCE.getButtonHTML(control_name,but[2],'{$pluginurl}/images/'+but[1],but[3],(but.length>4?but[4]:false));}if(control_name=="tablecontrols"){var html="";html+=tinyMCE.getControlHTML("table");html+=tinyMCE.getControlHTML("separator");html+=tinyMCE.getControlHTML("row_props");html+=tinyMCE.getControlHTML("cell_props");html+=tinyMCE.getControlHTML("separator");html+=tinyMCE.getControlHTML("row_before");html+=tinyMCE.getControlHTML("row_after");html+=tinyMCE.getControlHTML("delete_row");html+=tinyMCE.getControlHTML("separator");html+=tinyMCE.getControlHTML("col_before");html+=tinyMCE.getControlHTML("col_after");html+=tinyMCE.getControlHTML("delete_col");html+=tinyMCE.getControlHTML("separator");html+=tinyMCE.getControlHTML("split_cells");html+=tinyMCE.getControlHTML("merge_cells");return html;}return"";},execCommand:function(editor_id,element,command,user_interface,value){switch(command){case"mceInsertTable":case"mceTableRowProps":case"mceTableCellProps":case"mceTableSplitCells":case"mceTableMergeCells":case"mceTableInsertRowBefore":case"mceTableInsertRowAfter":case"mceTableDeleteRow":case"mceTableInsertColBefore":case"mceTableInsertColAfter":case"mceTableDeleteCol":case"mceTableCutRow":case"mceTableCopyRow":case"mceTablePasteRowBefore":case"mceTablePasteRowAfter":case"mceTableDelete":var inst=tinyMCE.getInstanceById(editor_id);inst.execCommand('mceBeginUndoLevel');TinyMCE_TablePlugin._doExecCommand(editor_id,element,command,user_interface,value);inst.execCommand('mceEndUndoLevel');return true;}return false;},handleNodeChange:function(editor_id,node,undo_index,undo_levels,visual_aid,any_selection){var colspan="1",rowspan="1";var inst=tinyMCE.getInstanceById(editor_id);tinyMCE.switchClass(editor_id+'_table','mceButtonNormal');tinyMCE.switchClass(editor_id+'_row_props','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_cell_props','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_row_before','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_row_after','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_delete_row','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_col_before','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_col_after','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_delete_col','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_split_cells','mceButtonDisabled');tinyMCE.switchClass(editor_id+'_merge_cells','mceButtonDisabled');if(tdElm=tinyMCE.getParentElement(node,"td,th")){tinyMCE.switchClass(editor_id+'_cell_props','mceButtonSelected');tinyMCE.switchClass(editor_id+'_row_before','mceButtonNormal');tinyMCE.switchClass(editor_id+'_row_after','mceButtonNormal');tinyMCE.switchClass(editor_id+'_delete_row','mceButtonNormal');tinyMCE.switchClass(editor_id+'_col_before','mceButtonNormal');tinyMCE.switchClass(editor_id+'_col_after','mceButtonNormal');tinyMCE.switchClass(editor_id+'_delete_col','mceButtonNormal');colspan=tinyMCE.getAttrib(tdElm,"colspan");rowspan=tinyMCE.getAttrib(tdElm,"rowspan");colspan=colspan==""?"1":colspan;rowspan=rowspan==""?"1":rowspan;if(colspan!="1"||rowspan!="1")tinyMCE.switchClass(editor_id+'_split_cells','mceButtonNormal');}if(tinyMCE.getParentElement(node,"tr"))tinyMCE.switchClass(editor_id+'_row_props','mceButtonSelected');if(tinyMCE.getParentElement(node,"table")){tinyMCE.switchClass(editor_id+'_table','mceButtonSelected');tinyMCE.switchClass(editor_id+'_merge_cells','mceButtonNormal');}},_mouseDownHandler:function(e){var elm=tinyMCE.isMSIE?event.srcElement:e.target;var focusElm=tinyMCE.selectedInstance.getFocusElement();if(elm.nodeName=="BODY"&&(focusElm.nodeName=="TD"||focusElm.nodeName=="TH"||(focusElm.parentNode&&focusElm.parentNode.nodeName=="TD")||(focusElm.parentNode&&focusElm.parentNode.nodeName=="TH"))){window.setTimeout(function(){var tableElm=tinyMCE.getParentElement(focusElm,"table");tinyMCE.handleVisualAid(tableElm,true,tinyMCE.settings['visual'],tinyMCE.selectedInstance);},10);}},_doExecCommand:function(editor_id,element,command,user_interface,value){var inst=tinyMCE.getInstanceById(editor_id);var focusElm=inst.getFocusElement();var trElm=tinyMCE.getParentElement(focusElm,"tr");var tdElm=tinyMCE.getParentElement(focusElm,"td,th");var tableElm=tinyMCE.getParentElement(focusElm,"table");var doc=inst.contentWindow.document;var tableBorder=tableElm?tableElm.getAttribute("border"):"";if(trElm&&tdElm==null)tdElm=trElm.cells[0];function inArray(ar,v){for(var i=0;i<ar.length;i++){if(ar[i].length>0&&inArray(ar[i],v))return true;if(ar[i]==v)return true;}return false;}function makeTD(){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";}function getColRowSpan(td){var colspan=tinyMCE.getAttrib(td,"colspan");var rowspan=tinyMCE.getAttrib(td,"rowspan");colspan=colspan==""?1:parseInt(colspan);rowspan=rowspan==""?1:parseInt(rowspan);return{colspan:colspan,rowspan:rowspan};}function getCellPos(grid,td){for(var y=0;y<grid.length;y++){for(var x=0;x<grid[y].length;x++){if(grid[y][x]==td)return{cellindex:x,rowindex:y};}}return null;}function getCell(grid,row,col){if(grid[row]&&grid[row][col])return grid[row][col];return null;}function getTableGrid(table){var grid=new Array();var rows=table.rows;for(var y=0;y<rows.length;y++){for(var x=0;x<rows[y].cells.length;x++){var td=rows[y].cells[x];var sd=getColRowSpan(td);for(xstart=x;grid[y]&&grid[y][xstart];xstart++);for(var y2=y;y2<y+sd['rowspan'];y2++){if(!grid[y2])grid[y2]=new Array();for(var x2=xstart;x2<xstart+sd['colspan'];x2++){grid[y2][x2]=td;}}}}return grid;}function trimRow(table,tr,td,new_tr){var grid=getTableGrid(table);var cpos=getCellPos(grid,td);if(new_tr.cells.length!=tr.childNodes.length){var cells=tr.childNodes;var lastElm=null;for(var x=0;td=getCell(grid,cpos.rowindex,x);x++){var remove=true;var sd=getColRowSpan(td);if(inArray(cells,td)){new_tr.childNodes[x]._delete=true;}else if((lastElm==null||td!=lastElm)&&sd.colspan>1){for(var i=x;i<x+td.colSpan;i++)new_tr.childNodes[i]._delete=true;}if((lastElm==null||td!=lastElm)&&sd.rowspan>1)td.rowSpan=sd.rowspan+1;lastElm=td;}deleteMarked(tableElm);}}function prevElm(node,name){while((node=node.previousSibling)!=null){if(node.nodeName==name)return node;}return null;}function nextElm(node,names){var namesAr=names.split(',');while((node=node.nextSibling)!=null){for(var i=0;i<namesAr.length;i++){if(node.nodeName.toLowerCase()==namesAr[i].toLowerCase())return node;}}return null;}function deleteMarked(tbl){if(tbl.rows==0)return;var tr=tbl.rows[0];do{var next=nextElm(tr,"TR");if(tr._delete){tr.parentNode.removeChild(tr);continue;}var td=tr.cells[0];if(td.cells>1){do{var nexttd=nextElm(td,"TD,TH");if(td._delete)td.parentNode.removeChild(td);}while((td=nexttd)!=null);}}while((tr=next)!=null);}function addRows(td_elm,tr_elm,rowspan){td_elm.rowSpan=1;var trNext=nextElm(tr_elm,"TR");for(var i=1;i<rowspan&&trNext;i++){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";if(tinyMCE.isMSIE)trNext.insertBefore(newTD,trNext.cells(td_elm.cellIndex));else trNext.insertBefore(newTD,trNext.cells[td_elm.cellIndex]);trNext=nextElm(trNext,"TR");}}function copyRow(doc,table,tr){var grid=getTableGrid(table);var newTR=tr.cloneNode(false);var cpos=getCellPos(grid,tr.cells[0]);var lastCell=null;var tableBorder=tinyMCE.getAttrib(table,"border");var tdElm=null;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){var newTD=null;if(lastCell!=tdElm){for(var i=0;i<tr.cells.length;i++){if(tdElm==tr.cells[i]){newTD=tdElm.cloneNode(true);break;}}}if(newTD==null){newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";}newTD.colSpan=1;newTD.rowSpan=1;newTR.appendChild(newTD);lastCell=tdElm;}return newTR;}switch(command){case"mceTableRowProps":if(trElm==null)return true;if(user_interface){var template=new Array();template['file']='../../plugins/table/row.htm';template['width']=380;template['height']=295;template['width']+=tinyMCE.getLang('lang_table_rowprops_delta_width',0);template['height']+=tinyMCE.getLang('lang_table_rowprops_delta_height',0);tinyMCE.openWindow(template,{editor_id:inst.editorId,inline:"yes"});}return true;case"mceTableCellProps":if(tdElm==null)return true;if(user_interface){var template=new Array();template['file']='../../plugins/table/cell.htm';template['width']=380;template['height']=295;template['width']+=tinyMCE.getLang('lang_table_cellprops_delta_width',0);template['height']+=tinyMCE.getLang('lang_table_cellprops_delta_height',0);tinyMCE.openWindow(template,{editor_id:inst.editorId,inline:"yes"});}return true;case"mceInsertTable":if(user_interface){var template=new Array();template['file']='../../plugins/table/table.htm';template['width']=380;template['height']=295;template['width']+=tinyMCE.getLang('lang_table_table_delta_width',0);template['height']+=tinyMCE.getLang('lang_table_table_delta_height',0);tinyMCE.openWindow(template,{editor_id:inst.editorId,inline:"yes",action:value});}return true;case"mceTableDelete":var table=tinyMCE.getParentElement(inst.getFocusElement(),"table");if(table){table.parentNode.removeChild(table);inst.repaint();}return true;case"mceTableSplitCells":case"mceTableMergeCells":case"mceTableInsertRowBefore":case"mceTableInsertRowAfter":case"mceTableDeleteRow":case"mceTableInsertColBefore":case"mceTableInsertColAfter":case"mceTableDeleteCol":case"mceTableCutRow":case"mceTableCopyRow":case"mceTablePasteRowBefore":case"mceTablePasteRowAfter":if(!tableElm)return true;if(tableElm!=trElm.parentNode)tableElm=trElm.parentNode;if(tableElm&&trElm){switch(command){case"mceTableInsertRowBefore":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var newTR=doc.createElement("tr");var lastTDElm=null;cpos.rowindex--;if(cpos.rowindex<0)cpos.rowindex=0;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['rowspan']==1){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";newTD.colSpan=tdElm.colSpan;newTR.appendChild(newTD);}else tdElm.rowSpan=sd['rowspan']+1;lastTDElm=tdElm;}}trElm.parentNode.insertBefore(newTR,trElm);break;case"mceTableCutRow":if(!trElm||!tdElm)return true;inst.tableRowClipboard=copyRow(doc,tableElm,trElm);inst.execCommand("mceTableDeleteRow");break;case"mceTableCopyRow":if(!trElm||!tdElm)return true;inst.tableRowClipboard=copyRow(doc,tableElm,trElm);break;case"mceTablePasteRowBefore":if(!trElm||!tdElm)return true;var newTR=inst.tableRowClipboard.cloneNode(true);var prevTR=prevElm(trElm,"TR");if(prevTR!=null)trimRow(tableElm,prevTR,prevTR.cells[0],newTR);trElm.parentNode.insertBefore(newTR,trElm);break;case"mceTablePasteRowAfter":if(!trElm||!tdElm)return true;var nextTR=nextElm(trElm,"TR");var newTR=inst.tableRowClipboard.cloneNode(true);trimRow(tableElm,trElm,tdElm,newTR);if(nextTR==null)trElm.parentNode.appendChild(newTR);else nextTR.parentNode.insertBefore(newTR,nextTR);break;case"mceTableInsertRowAfter":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var newTR=doc.createElement("tr");var lastTDElm=null;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['rowspan']==1){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";newTD.colSpan=tdElm.colSpan;newTR.appendChild(newTD);}else tdElm.rowSpan=sd['rowspan']+1;lastTDElm=tdElm;}}if(newTR.hasChildNodes()){var nextTR=nextElm(trElm,"TR");if(nextTR)nextTR.parentNode.insertBefore(newTR,nextTR);else tableElm.appendChild(newTR);}break;case"mceTableDeleteRow":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);if(grid.length==1){tableElm.parentNode.removeChild(tableElm);return true;}var cells=trElm.cells;var nextTR=nextElm(trElm,"TR");for(var x=0;x<cells.length;x++){if(cells[x].rowSpan>1){var newTD=cells[x].cloneNode(true);var sd=getColRowSpan(cells[x]);newTD.rowSpan=sd.rowspan-1;var nextTD=nextTR.cells[x];if(nextTD==null)nextTR.appendChild(newTD);else nextTR.insertBefore(newTD,nextTD);}}var lastTDElm=null;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd.rowspan>1){tdElm.rowSpan=sd.rowspan-1;}else{trElm=tdElm.parentNode;if(trElm.parentNode)trElm._delete=true;}lastTDElm=tdElm;}}deleteMarked(tableElm);cpos.rowindex--;if(cpos.rowindex<0)cpos.rowindex=0;inst.selection.selectNode(getCell(grid,cpos.rowindex,0),true,true);break;case"mceTableInsertColBefore":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var lastTDElm=null;for(var y=0;tdElm=getCell(grid,y,cpos.cellindex);y++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['colspan']==1){var newTD=doc.createElement(tdElm.nodeName);newTD.innerHTML="&nbsp;";newTD.rowSpan=tdElm.rowSpan;tdElm.parentNode.insertBefore(newTD,tdElm);}else tdElm.colSpan++;lastTDElm=tdElm;}}break;case"mceTableInsertColAfter":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var lastTDElm=null;for(var y=0;tdElm=getCell(grid,y,cpos.cellindex);y++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['colspan']==1){var newTD=doc.createElement(tdElm.nodeName);newTD.innerHTML="&nbsp;";newTD.rowSpan=tdElm.rowSpan;var nextTD=nextElm(tdElm,"TD,TH");if(nextTD==null)tdElm.parentNode.appendChild(newTD);else nextTD.parentNode.insertBefore(newTD,nextTD);}else tdElm.colSpan++;lastTDElm=tdElm;}}break;case"mceTableDeleteCol":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var lastTDElm=null;if(grid.length>1&&grid[0].length<=1){tableElm.parentNode.removeChild(tableElm);return true;}for(var y=0;tdElm=getCell(grid,y,cpos.cellindex);y++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['colspan']>1)tdElm.colSpan=sd['colspan']-1;else{if(tdElm.parentNode)tdElm.parentNode.removeChild(tdElm);}lastTDElm=tdElm;}}cpos.cellindex--;if(cpos.cellindex<0)cpos.cellindex=0;inst.selection.selectNode(getCell(grid,0,cpos.cellindex),true,true);break;case"mceTableSplitCells":if(!trElm||!tdElm)return true;var spandata=getColRowSpan(tdElm);var colspan=spandata["colspan"];var rowspan=spandata["rowspan"];if(colspan>1||rowspan>1){tdElm.colSpan=1;for(var i=1;i<colspan;i++){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";trElm.insertBefore(newTD,nextElm(tdElm,"TD,TH"));if(rowspan>1)addRows(newTD,trElm,rowspan);}addRows(tdElm,trElm,rowspan);}tableElm=tinyMCE.getParentElement(inst.getFocusElement(),"table");break;case"mceTableMergeCells":var rows=new Array();var sel=inst.getSel();var grid=getTableGrid(tableElm);if(tinyMCE.isMSIE||sel.rangeCount==1){if(user_interface){var template=new Array();var sp=getColRowSpan(tdElm);template['file']='../../plugins/table/merge_cells.htm';template['width']=250;template['height']=105+(tinyMCE.isNS7?25:0);template['width']+=tinyMCE.getLang('lang_table_merge_cells_delta_width',0);template['height']+=tinyMCE.getLang('lang_table_merge_cells_delta_height',0);tinyMCE.openWindow(template,{editor_id:inst.editorId,inline:"yes",action:"update",numcols:sp.colspan,numrows:sp.rowspan});return true;}else{var numRows=parseInt(value['numrows']);var numCols=parseInt(value['numcols']);var cpos=getCellPos(grid,tdElm);if((""+numRows)=="NaN")numRows=1;if((""+numCols)=="NaN")numCols=1;var tRows=tableElm.rows;for(var y=cpos.rowindex;y<grid.length;y++){var rowCells=new Array();for(var x=cpos.cellindex;x<grid[y].length;x++){var td=getCell(grid,y,x);if(td&&!inArray(rows,td)&&!inArray(rowCells,td)){var cp=getCellPos(grid,td);if(cp.cellindex<cpos.cellindex+numCols&&cp.rowindex<cpos.rowindex+numRows)rowCells[rowCells.length]=td;}}if(rowCells.length>0)rows[rows.length]=rowCells;}}}else{var cells=new Array();var sel=inst.getSel();var lastTR=null;var curRow=null;var x1=-1,y1=-1,x2,y2;if(sel.rangeCount<2)return true;for(var i=0;i<sel.rangeCount;i++){var rng=sel.getRangeAt(i);var tdElm=rng.startContainer.childNodes[rng.startOffset];if(!tdElm)break;if(tdElm.nodeName=="TD")cells[cells.length]=tdElm;}var tRows=tableElm.rows;for(var y=0;y<tRows.length;y++){var rowCells=new Array();for(var x=0;x<tRows[y].cells.length;x++){var td=tRows[y].cells[x];for(var i=0;i<cells.length;i++){if(td==cells[i]){rowCells[rowCells.length]=td;}}}if(rowCells.length>0)rows[rows.length]=rowCells;}var curRow=new Array();var lastTR=null;for(var y=0;y<grid.length;y++){for(var x=0;x<grid[y].length;x++){grid[y][x]._selected=false;for(var i=0;i<cells.length;i++){if(grid[y][x]==cells[i]){if(x1==-1){x1=x;y1=y;}x2=x;y2=y;grid[y][x]._selected=true;}}}}for(var y=y1;y<=y2;y++){for(var x=x1;x<=x2;x++){if(!grid[y][x]._selected){alert("Invalid selection for merge.");return true;}}}}var rowSpan=1,colSpan=1;var lastRowSpan=-1;for(var y=0;y<rows.length;y++){var rowColSpan=0;for(var x=0;x<rows[y].length;x++){var sd=getColRowSpan(rows[y][x]);rowColSpan+=sd['colspan'];if(lastRowSpan!=-1&&sd['rowspan']!=lastRowSpan){alert("Invalid selection for merge.");return true;}lastRowSpan=sd['rowspan'];}if(rowColSpan>colSpan)colSpan=rowColSpan;lastRowSpan=-1;}var lastColSpan=-1;for(var x=0;x<rows[0].length;x++){var colRowSpan=0;for(var y=0;y<rows.length;y++){var sd=getColRowSpan(rows[y][x]);colRowSpan+=sd['rowspan'];if(lastColSpan!=-1&&sd['colspan']!=lastColSpan){alert("Invalid selection for merge.");return true;}lastColSpan=sd['colspan'];}if(colRowSpan>rowSpan)rowSpan=colRowSpan;lastColSpan=-1;}tdElm=rows[0][0];tdElm.rowSpan=rowSpan;tdElm.colSpan=colSpan;for(var y=0;y<rows.length;y++){for(var x=0;x<rows[y].length;x++){var html=rows[y][x].innerHTML;var chk=tinyMCE.regexpReplace(html,"[ \t\r\n]","");if(chk!="<br/>"&&chk!="<br>"&&chk!="&nbsp;"&&(x+y>0))tdElm.innerHTML+=html;if(rows[y][x]!=tdElm&&!rows[y][x]._deleted){var cpos=getCellPos(grid,rows[y][x]);var tr=rows[y][x].parentNode;tr.removeChild(rows[y][x]);rows[y][x]._deleted=true;if(!tr.hasChildNodes()){tr.parentNode.removeChild(tr);var lastCell=null;for(var x=0;cellElm=getCell(grid,cpos.rowindex,x);x++){if(cellElm!=lastCell&&cellElm.rowSpan>1)cellElm.rowSpan--;lastCell=cellElm;}if(tdElm.rowSpan>1)tdElm.rowSpan--;}}}}break;}tableElm=tinyMCE.getParentElement(inst.getFocusElement(),"table");tinyMCE.handleVisualAid(tableElm,true,tinyMCE.settings['visual'],tinyMCE.selectedInstance);tinyMCE.triggerNodeChange();inst.repaint();}return true;}return false;}};tinyMCE.addPlugin("table",TinyMCE_TablePlugin);
\ No newline at end of file
+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');function TinyMCE_table_initInstance(inst){if(tinyMCE.isGecko)tinyMCE.addEvent(inst.getDoc(),"mouseup",TinyMCE_table_mouseDownHandler);inst.tableRowClipboard=null;}function TinyMCE_table_mouseDownHandler(e){var elm=tinyMCE.isMSIE?event.srcElement:e.target;var focusElm=tinyMCE.selectedInstance.getFocusElement();if(elm.nodeName=="BODY"&&(focusElm.nodeName=="TD"||(focusElm.parentNode&&focusElm.parentNode.nodeName=="TD"))){window.setTimeout(function(){var tableElm=tinyMCE.getParentElement(focusElm,"table");tinyMCE.handleVisualAid(tableElm,true,tinyMCE.settings['visual']);},10);}}function TinyMCE_table_getControlHTML(control_name){var controls=new Array(['table','table.gif','{$lang_table_desc}','mceInsertTable',true],['delete_col','table_delete_col.gif','{$lang_table_delete_col_desc}','mceTableDeleteCol'],['delete_row','table_delete_row.gif','{$lang_table_delete_row_desc}','mceTableDeleteRow'],['col_after','table_insert_col_after.gif','{$lang_table_insert_col_after_desc}','mceTableInsertColAfter'],['col_before','table_insert_col_before.gif','{$lang_table_insert_col_before_desc}','mceTableInsertColBefore'],['row_after','table_insert_row_after.gif','{$lang_table_insert_row_after_desc}','mceTableInsertRowAfter'],['row_before','table_insert_row_before.gif','{$lang_table_insert_row_before_desc}','mceTableInsertRowBefore'],['row_props','table_row_props.gif','{$lang_table_row_desc}','mceTableRowProps',true],['cell_props','table_cell_props.gif','{$lang_table_cell_desc}','mceTableCellProps',true],['split_cells','table_split_cells.gif','{$lang_table_split_cells_desc}','mceTableSplitCells',true],['merge_cells','table_merge_cells.gif','{$lang_table_merge_cells_desc}','mceTableMergeCells',true]);for(var i=0;i<controls.length;i++){var but=controls[i];var safariPatch='" onclick="';if(tinyMCE.isSafari)safariPatch="";if(but[0]==control_name&&(tinyMCE.isMSIE||!tinyMCE.settings['button_tile_map']))return'<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\');'+safariPatch+'tinyMCE.execInstanceCommand(\'{$editor_id}\',\''+but[3]+'\', '+(but.length>4?but[4]:false)+(but.length>5?', \''+but[5]+'\'':'')+')">';else if(but[0]==control_name)return'<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\');'+safariPatch+'tinyMCE.execInstanceCommand(\'{$editor_id}\',\''+but[3]+'\', '+(but.length>4?but[4]:false)+(but.length>5?', \''+but[5]+'\'':'')+')">';}if(control_name=="tablecontrols"){var html="";html+=tinyMCE.getControlHTML("table");html+=tinyMCE.getControlHTML("separator");html+=tinyMCE.getControlHTML("row_props");html+=tinyMCE.getControlHTML("cell_props");html+=tinyMCE.getControlHTML("separator");html+=tinyMCE.getControlHTML("row_before");html+=tinyMCE.getControlHTML("row_after");html+=tinyMCE.getControlHTML("delete_row");html+=tinyMCE.getControlHTML("separator");html+=tinyMCE.getControlHTML("col_before");html+=tinyMCE.getControlHTML("col_after");html+=tinyMCE.getControlHTML("delete_col");html+=tinyMCE.getControlHTML("separator");html+=tinyMCE.getControlHTML("split_cells");html+=tinyMCE.getControlHTML("merge_cells");return html;}return"";}function TinyMCE_table_execCommand(editor_id,element,command,user_interface,value){var inst=tinyMCE.getInstanceById(editor_id);var focusElm=inst.getFocusElement();var trElm=tinyMCE.getParentElement(focusElm,"tr");var tdElm=tinyMCE.getParentElement(focusElm,"td");var tableElm=tinyMCE.getParentElement(focusElm,"table");var doc=inst.contentWindow.document;var tableBorder=tableElm?tableElm.getAttribute("border"):"";if(trElm&&tdElm==null)tdElm=trElm.cells[0];function inArray(ar,v){for(var i=0;i<ar.length;i++){if(ar[i].length>0&&inArray(ar[i],v))return true;if(ar[i]==v)return true;}return false;}function makeTD(){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";}function getColRowSpan(td){var colspan=tinyMCE.getAttrib(td,"colspan");var rowspan=tinyMCE.getAttrib(td,"rowspan");colspan=colspan==""?1:parseInt(colspan);rowspan=rowspan==""?1:parseInt(rowspan);return{colspan:colspan,rowspan:rowspan};}function getCellPos(grid,td){for(var y=0;y<grid.length;y++){for(var x=0;x<grid[y].length;x++){if(grid[y][x]==td)return{cellindex:x,rowindex:y};}}return null;}function getCell(grid,row,col){if(grid[row]&&grid[row][col])return grid[row][col];return null;}function getTableGrid(table){var grid=new Array();var rows=table.rows;for(var y=0;y<rows.length;y++){for(var x=0;x<rows[y].cells.length;x++){var td=rows[y].cells[x];var sd=getColRowSpan(td);for(xstart=x;grid[y]&&grid[y][xstart];xstart++);for(var y2=y;y2<y+sd['rowspan'];y2++){if(!grid[y2])grid[y2]=new Array();for(var x2=xstart;x2<xstart+sd['colspan'];x2++){grid[y2][x2]=td;}}}}return grid;}function trimRow(table,tr,td,new_tr){var grid=getTableGrid(table);var cpos=getCellPos(grid,td);if(new_tr.cells.length!=tr.childNodes.length){var cells=tr.childNodes;var lastElm=null;for(var x=0;td=getCell(grid,cpos.rowindex,x);x++){var remove=true;var sd=getColRowSpan(td);if(inArray(cells,td)){new_tr.childNodes[x]._delete=true;}else if((lastElm==null||td!=lastElm)&&sd.colspan>1){for(var i=x;i<x+td.colSpan;i++)new_tr.childNodes[i]._delete=true;}if((lastElm==null||td!=lastElm)&&sd.rowspan>1)td.rowSpan=sd.rowspan+1;lastElm=td;}deleteMarked(tableElm);}}function prevElm(node,name){while((node=node.previousSibling)!=null){if(node.nodeName==name)return node;}return null;}function nextElm(node,name){while((node=node.nextSibling)!=null){if(node.nodeName==name)return node;}return null;}function deleteMarked(tbl){if(tbl.rows==0)return;var tr=tbl.rows[0];do{var next=nextElm(tr,"TR");if(tr._delete){tr.parentNode.removeChild(tr);continue;}var td=tr.cells[0];if(td.cells>1){do{var nexttd=nextElm(td,"TD");if(td._delete)td.parentNode.removeChild(td);}while((td=nexttd)!=null);}}while((tr=next)!=null);}function addRows(td_elm,tr_elm,rowspan){td_elm.rowSpan=1;var trNext=nextElm(tr_elm,"TR");for(var i=1;i<rowspan&&trNext;i++){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";if(tinyMCE.isMSIE)trNext.insertBefore(newTD,trNext.cells(td_elm.cellIndex));else trNext.insertBefore(newTD,trNext.cells[td_elm.cellIndex]);trNext=nextElm(trNext,"TR");}}function copyRow(doc,table,tr){var grid=getTableGrid(table);var newTR=tr.cloneNode(false);var cpos=getCellPos(grid,tr.cells[0]);var lastCell=null;var tableBorder=tinyMCE.getAttrib(table,"border");var tdElm=null;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){var newTD=null;if(lastCell!=tdElm){for(var i=0;i<tr.cells.length;i++){if(tdElm==tr.cells[i]){newTD=tdElm.cloneNode(true);break;}}}if(newTD==null){newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";}newTD.colSpan=1;newTD.rowSpan=1;newTR.appendChild(newTD);lastCell=tdElm;}return newTR;}switch(command){case"mceTableRowProps":if(trElm==null)return true;if(user_interface){var template=new Array();template['file']='../../plugins/table/row.htm';if(tinyMCE.settings['table_color_fields']){template['width']=400;template['height']=220;}else{template['width']=340;template['height']=220;}tinyMCE.openWindow(template,{editor_id:inst.editorId,align:tinyMCE.getAttrib(trElm,'align'),valign:tinyMCE.getAttrib(trElm,'valign'),height:tinyMCE.getAttrib(trElm,'height'),className:tinyMCE.getVisualAidClass(tinyMCE.getAttrib(trElm,'class'),false),bordercolor:tinyMCE.getAttrib(trElm,'bordercolor'),bgcolor:tinyMCE.getAttrib(trElm,'bgcolor')});}else{inst.execCommand("mceAddUndoLevel");trElm.setAttribute('align',value['align']);trElm.setAttribute('vAlign',value['valign']);trElm.setAttribute('height',value['height']);trElm.setAttribute('bordercolor',value['bordercolor']);trElm.setAttribute('bgcolor',value['bgcolor']);tinyMCE.setAttrib(trElm,'class',value['className']);trElm.borderColor=value['bordercolor'];trElm.bgColor=value['bgcolor'];}tinyMCE.triggerNodeChange();return true;case"mceTableCellProps":if(tdElm==null)return true;if(user_interface){var template=new Array();template['file']='../../plugins/table/cell.htm';if(tinyMCE.settings['table_color_fields']){template['width']=400;template['height']=240;}else{template['width']=340;template['height']=220;}tinyMCE.openWindow(template,{editor_id:inst.editorId,align:tinyMCE.getAttrib(tdElm,'align'),valign:tinyMCE.getAttrib(tdElm,'valign'),width:tinyMCE.getAttrib(tdElm,'width'),height:tinyMCE.getAttrib(tdElm,'height'),className:tinyMCE.getVisualAidClass(tinyMCE.getAttrib(tdElm,'class'),false),bordercolor:tinyMCE.getAttrib(tdElm,'bordercolor'),bgcolor:tinyMCE.getAttrib(tdElm,'bgcolor')});}else{inst.execCommand("mceAddUndoLevel");tdElm.setAttribute('align',value['align']);tdElm.setAttribute('vAlign',value['valign']);tdElm.setAttribute('width',value['width']);tdElm.setAttribute('height',value['height']);tdElm.setAttribute('bordercolor',value['bordercolor']);tdElm.setAttribute('bgcolor',value['bgcolor']);tinyMCE.setAttrib(tdElm,'class',tinyMCE.getVisualAidClass(value['className']));tdElm.borderColor=value['bordercolor'];tdElm.bgColor=value['bgcolor'];}tinyMCE.triggerNodeChange();return true;case"mceInsertTable":if(user_interface){var cols=2,rows=2,border=0,cellpadding="",cellspacing="",align="",width="",height="",bordercolor="",bgcolor="",action="insert",className="";tinyMCE.tableElm=tinyMCE.getParentElement(inst.getFocusElement(),"table");if(tinyMCE.tableElm&&value!="insert"){var rowsAr=tinyMCE.tableElm.rows;var cols=0;for(var i=0;i<rowsAr.length;i++)if(rowsAr[i].cells.length>cols)cols=rowsAr[i].cells.length;cols=cols;rows=rowsAr.length;border=tinyMCE.getAttrib(tinyMCE.tableElm,'border',border);cellpadding=tinyMCE.getAttrib(tinyMCE.tableElm,'cellpadding',"");cellspacing=tinyMCE.getAttrib(tinyMCE.tableElm,'cellspacing',"");width=tinyMCE.getAttrib(tinyMCE.tableElm,'width',width);height=tinyMCE.getAttrib(tinyMCE.tableElm,'height',height);bordercolor=tinyMCE.getAttrib(tinyMCE.tableElm,'bordercolor',bordercolor);bgcolor=tinyMCE.getAttrib(tinyMCE.tableElm,'bgcolor',bgcolor);align=tinyMCE.getAttrib(tinyMCE.tableElm,'align',align);className=tinyMCE.getVisualAidClass(tinyMCE.getAttrib(tinyMCE.tableElm,'class'),false);if(tinyMCE.isMSIE){width=tinyMCE.tableElm.style.pixelWidth==0?tinyMCE.tableElm.getAttribute("width"):tinyMCE.tableElm.style.pixelWidth;height=tinyMCE.tableElm.style.pixelHeight==0?tinyMCE.tableElm.getAttribute("height"):tinyMCE.tableElm.style.pixelHeight;}action="update";}var template=new Array();template['file']='../../plugins/table/table.htm';if(tinyMCE.settings['table_color_fields']){template['width']=400;template['height']=240;}else{template['width']=340;template['height']=220;}template['width']+=tinyMCE.getLang('lang_insert_table_delta_width',0);template['height']+=tinyMCE.getLang('lang_insert_table_delta_height',0);tinyMCE.openWindow(template,{editor_id:inst.editorId,cols:cols,rows:rows,border:border,cellpadding:cellpadding,cellspacing:cellspacing,align:align,width:width,height:height,bordercolor:bordercolor,bgcolor:bgcolor,action:action,className:className});}else{var html='';var cols=2,rows=2,border=0,cellpadding=-1,cellspacing=-1,align,width,height,className,action;if(typeof(value)=='object'){cols=value['cols'];rows=value['rows'];border=value['border']!=""?value['border']:0;cellpadding=value['cellpadding']!=""?value['cellpadding']:-1;cellspacing=value['cellspacing']!=""?value['cellspacing']:-1;align=value['align'];width=value['width'];height=value['height'];bordercolor=value['bordercolor'];bgcolor=value['bgcolor'];className=value['className'];action=value['action'];}if(tinyMCE.tableElm&&action=="update"){inst.execCommand("mceAddUndoLevel");tinyMCE.setAttrib(tinyMCE.tableElm,'cellPadding',cellpadding,true);tinyMCE.setAttrib(tinyMCE.tableElm,'cellSpacing',cellspacing,true);tinyMCE.setAttrib(tinyMCE.tableElm,'border',border,true);tinyMCE.setAttrib(tinyMCE.tableElm,'width',width,true);tinyMCE.setAttrib(tinyMCE.tableElm,'height',height,true);tinyMCE.setAttrib(tinyMCE.tableElm,'bordercolor',bordercolor);tinyMCE.setAttrib(tinyMCE.tableElm,'bgcolor',bgcolor);tinyMCE.setAttrib(tinyMCE.tableElm,'align',align);tinyMCE.setAttrib(tinyMCE.tableElm,'class',className);if(tinyMCE.isMSIE){tinyMCE.tableElm.style.pixelWidth=(width==null||width=="")?0:width;tinyMCE.tableElm.style.pixelHeight=(height==null||height=="")?0:height;tinyMCE.tableElm.borderColor=bordercolor;tinyMCE.tableElm.bgColor=bgcolor;}tinyMCE.handleVisualAid(tinyMCE.tableElm,false,inst.visualAid);tinyMCE.tableElm.outerHTML=tinyMCE.tableElm.outerHTML;tinyMCE.triggerNodeChange();return true;}html+='<table border="'+border+'" ';if(cellpadding!=-1)html+='cellpadding="'+cellpadding+'" ';if(cellspacing!=-1)html+='cellspacing="'+cellspacing+'" ';if(width!=0&&width!="")html+='width="'+width+'" ';if(height!=0&&height!="")html+='height="'+height+'" ';if(bordercolor!=0&&bordercolor!="")html+='bordercolor="'+bordercolor+'" ';if(bgcolor!=0&&bgcolor!="")html+='bgcolor="'+bgcolor+'" ';if(align)html+='align="'+align+'" ';if(className)html+='class="'+tinyMCE.getVisualAidClass(className,border==0)+'" ';html+='>';for(var y=0;y<rows;y++){if(y==0){html+="<tr>";for(var x=0;x<cols;x++)html+='<td>&nbsp;</td>';html+="</tr>";}else{html+="<tr>";for(var x=0;x<cols;x++)html+='<td>&nbsp;</td>';html+="</tr>";}}html+="</table>";inst.execCommand('mceInsertContent',false,html);}return true;case"mceTableSplitCells":case"mceTableMergeCells":case"mceTableInsertRowBefore":case"mceTableInsertRowAfter":case"mceTableDeleteRow":case"mceTableInsertColBefore":case"mceTableInsertColAfter":case"mceTableDeleteCol":case"mceTableCutRow":case"mceTableCopyRow":case"mceTablePasteRowBefore":case"mceTablePasteRowAfter":inst.execCommand("mceAddUndoLevel");if(!tableElm)return true;if(tableElm.firstChild&&tableElm.firstChild.nodeName.toLowerCase()=="tbody")tableElm=tableElm.firstChild;if(tableElm&&trElm){switch(command){case"mceTableInsertRowBefore":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var newTR=doc.createElement("tr");var lastTDElm=null;cpos.rowindex--;if(cpos.rowindex<0)cpos.rowindex=0;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['rowspan']==1){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";newTD.colSpan=tdElm.colSpan;newTR.appendChild(newTD);}else tdElm.rowSpan=sd['rowspan']+1;lastTDElm=tdElm;}}trElm.parentNode.insertBefore(newTR,trElm);break;case"mceTableCutRow":if(!trElm||!tdElm)return true;inst.tableRowClipboard=copyRow(doc,tableElm,trElm);inst.execCommand("mceTableDeleteRow");break;case"mceTableCopyRow":if(!trElm||!tdElm)return true;inst.tableRowClipboard=copyRow(doc,tableElm,trElm);break;case"mceTablePasteRowBefore":if(!trElm||!tdElm)return true;var newTR=inst.tableRowClipboard.cloneNode(true);var prevTR=prevElm(trElm,"TR");if(prevTR!=null)trimRow(tableElm,prevTR,prevTR.cells[0],newTR);trElm.parentNode.insertBefore(newTR,trElm);break;case"mceTablePasteRowAfter":if(!trElm||!tdElm)return true;var nextTR=nextElm(trElm,"TR");var newTR=inst.tableRowClipboard.cloneNode(true);trimRow(tableElm,trElm,tdElm,newTR);if(nextTR==null)trElm.parentNode.appendChild(newTR);else nextTR.parentNode.insertBefore(newTR,nextTR);break;case"mceTableInsertRowAfter":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var newTR=doc.createElement("tr");var lastTDElm=null;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['rowspan']==1){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";newTD.colSpan=tdElm.colSpan;newTR.appendChild(newTD);}else tdElm.rowSpan=sd['rowspan']+1;lastTDElm=tdElm;}}if(newTR.hasChildNodes()){var nextTR=nextElm(trElm,"TR");if(nextTR)nextTR.parentNode.insertBefore(newTR,nextTR);else tableElm.appendChild(newTR);}break;case"mceTableDeleteRow":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);if(grid.length==1){tableElm.parentNode.removeChild(tableElm);return true;}var cells=trElm.cells;var nextTR=nextElm(trElm,"TR");for(var x=0;x<cells.length;x++){if(cells[x].rowSpan>1){var newTD=cells[x].cloneNode(true);var sd=getColRowSpan(cells[x]);newTD.rowSpan=sd.rowspan-1;var nextTD=nextTR.cells[x];if(nextTD==null)nextTR.appendChild(newTD);else nextTR.insertBefore(newTD,nextTD);}}var lastTDElm=null;for(var x=0;tdElm=getCell(grid,cpos.rowindex,x);x++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd.rowspan>1){tdElm.rowSpan=sd.rowspan-1;}else{trElm=tdElm.parentNode;if(trElm.parentNode)trElm._delete=true;}lastTDElm=tdElm;}}deleteMarked(tableElm);cpos.rowindex--;if(cpos.rowindex<0)cpos.rowindex=0;inst.selectNode(getCell(grid,cpos.rowindex,0),true,true);break;case"mceTableInsertColBefore":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var lastTDElm=null;for(var y=0;tdElm=getCell(grid,y,cpos.cellindex);y++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['colspan']==1){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";newTD.rowSpan=tdElm.rowSpan;tdElm.parentNode.insertBefore(newTD,tdElm);}else tdElm.colSpan++;lastTDElm=tdElm;}}break;case"mceTableInsertColAfter":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var lastTDElm=null;for(var y=0;tdElm=getCell(grid,y,cpos.cellindex);y++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['colspan']==1){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";newTD.rowSpan=tdElm.rowSpan;var nextTD=nextElm(tdElm,"TD");if(nextTD==null)tdElm.parentNode.appendChild(newTD);else nextTD.parentNode.insertBefore(newTD,nextTD);}else tdElm.colSpan++;lastTDElm=tdElm;}}break;case"mceTableDeleteCol":if(!trElm||!tdElm)return true;var grid=getTableGrid(tableElm);var cpos=getCellPos(grid,tdElm);var lastTDElm=null;if(grid.length>1&&grid[0].length<=1){tableElm.parentNode.removeChild(tableElm);return true;}for(var y=0;tdElm=getCell(grid,y,cpos.cellindex);y++){if(tdElm!=lastTDElm){var sd=getColRowSpan(tdElm);if(sd['colspan']>1)tdElm.colSpan=sd['colspan']-1;else{if(tdElm.parentNode)tdElm.parentNode.removeChild(tdElm);}lastTDElm=tdElm;}}cpos.cellindex--;if(cpos.cellindex<0)cpos.cellindex=0;inst.selectNode(getCell(grid,0,cpos.cellindex),true,true);break;case"mceTableSplitCells":if(!trElm||!tdElm)return true;var spandata=getColRowSpan(tdElm);var colspan=spandata["colspan"];var rowspan=spandata["rowspan"];if(colspan>1||rowspan>1){tdElm.colSpan=1;for(var i=1;i<colspan;i++){var newTD=doc.createElement("td");newTD.innerHTML="&nbsp;";trElm.insertBefore(newTD,nextElm(tdElm,"TD"));if(rowspan>1)addRows(newTD,trElm,rowspan);}addRows(tdElm,trElm,rowspan);}tableElm=tinyMCE.getParentElement(inst.getFocusElement(),"table");break;case"mceTableMergeCells":var rows=new Array();var sel=inst.getSel();var grid=getTableGrid(tableElm);if(tinyMCE.isMSIE||sel.rangeCount==1){if(user_interface){var template=new Array();var sp=getColRowSpan(tdElm);template['file']='../../plugins/table/merge_cells.htm';template['width']=160;template['height']=220;tinyMCE.openWindow(template,{editor_id:inst.editorId,action:"update",numcols:sp.colspan,numrows:sp.rowspan});return true;}else{var numRows=parseInt(value['numrows']);var numCols=parseInt(value['numcols']);var cpos=getCellPos(grid,tdElm);if((""+numRows)=="NaN")numRows=1;if((""+numCols)=="NaN")numCols=1;var tRows=tableElm.rows;for(var y=cpos.rowindex;y<grid.length;y++){var rowCells=new Array();for(var x=cpos.cellindex;x<grid[y].length;x++){var td=getCell(grid,y,x);if(td&&!inArray(rows,td)&&!inArray(rowCells,td)){var cp=getCellPos(grid,td);if(cp.cellindex<cpos.cellindex+numCols&&cp.rowindex<cpos.rowindex+numRows)rowCells[rowCells.length]=td;}}if(rowCells.length>0)rows[rows.length]=rowCells;}}}else{var cells=new Array();var sel=inst.getSel();var lastTR=null;var curRow=null;var x1=-1,y1=-1,x2,y2;if(sel.rangeCount<2)return true;for(var i=0;i<sel.rangeCount;i++){var rng=sel.getRangeAt(i);var tdElm=rng.startContainer.childNodes[rng.startOffset];if(!tdElm)break;if(tdElm.nodeName=="TD")cells[cells.length]=tdElm;}var tRows=tableElm.rows;for(var y=0;y<tRows.length;y++){var rowCells=new Array();for(var x=0;x<tRows[y].cells.length;x++){var td=tRows[y].cells[x];for(var i=0;i<cells.length;i++){if(td==cells[i]){rowCells[rowCells.length]=td;}}}if(rowCells.length>0)rows[rows.length]=rowCells;}var curRow=new Array();var lastTR=null;for(var y=0;y<grid.length;y++){for(var x=0;x<grid[y].length;x++){grid[y][x]._selected=false;for(var i=0;i<cells.length;i++){if(grid[y][x]==cells[i]){if(x1==-1){x1=x;y1=y;}x2=x;y2=y;grid[y][x]._selected=true;}}}}for(var y=y1;y<=y2;y++){for(var x=x1;x<=x2;x++){if(!grid[y][x]._selected){alert("Invalid selection for merge.");return true;}}}}var rowSpan=1,colSpan=1;var lastRowSpan=-1;for(var y=0;y<rows.length;y++){var rowColSpan=0;for(var x=0;x<rows[y].length;x++){var sd=getColRowSpan(rows[y][x]);rowColSpan+=sd['colspan'];if(lastRowSpan!=-1&&sd['rowspan']!=lastRowSpan){alert("Invalid selection for merge.");return true;}lastRowSpan=sd['rowspan'];}if(rowColSpan>colSpan)colSpan=rowColSpan;lastRowSpan=-1;}var lastColSpan=-1;for(var x=0;x<rows[0].length;x++){var colRowSpan=0;for(var y=0;y<rows.length;y++){var sd=getColRowSpan(rows[y][x]);colRowSpan+=sd['rowspan'];if(lastColSpan!=-1&&sd['colspan']!=lastColSpan){alert("Invalid selection for merge.");return true;}lastColSpan=sd['colspan'];}if(colRowSpan>rowSpan)rowSpan=colRowSpan;lastColSpan=-1;}tdElm=rows[0][0];tdElm.rowSpan=rowSpan;tdElm.colSpan=colSpan;for(var y=0;y<rows.length;y++){for(var x=0;x<rows[y].length;x++){var html=rows[y][x].innerHTML;var chk=tinyMCE.regexpReplace(html,"[ \t\r\n]","");if(chk!="<br/>"&&chk!="<br>"&&chk!="&nbsp;"&&(x+y>0))tdElm.innerHTML+=html;if(rows[y][x]!=tdElm&&!rows[y][x]._deleted){var cpos=getCellPos(grid,rows[y][x]);var tr=rows[y][x].parentNode;tr.removeChild(rows[y][x]);rows[y][x]._deleted=true;if(!tr.hasChildNodes()){tr.parentNode.removeChild(tr);var lastCell=null;for(var x=0;cellElm=getCell(grid,cpos.rowindex,x);x++){if(cellElm!=lastCell&&cellElm.rowSpan>1)cellElm.rowSpan--;lastCell=cellElm;}if(tdElm.rowSpan>1)tdElm.rowSpan--;}}}}break;}tableElm=tinyMCE.getParentElement(inst.getFocusElement(),"table");tinyMCE.handleVisualAid(tableElm,true,tinyMCE.settings['visual']);tinyMCE.triggerNodeChange();inst.repaint();}return true;}return false;}function TinyMCE_table_handleNodeChange(editor_id,node,undo_index,undo_levels,visual_aid,any_selection){var colspan="1",rowspan="1";var inst=tinyMCE.getInstanceById(editor_id);tinyMCE.switchClassSticky(editor_id+'_table','mceButtonNormal');tinyMCE.switchClassSticky(editor_id+'_row_props','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_cell_props','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_row_before','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_row_after','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_delete_row','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_col_before','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_col_after','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_delete_col','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_split_cells','mceButtonDisabled',true);tinyMCE.switchClassSticky(editor_id+'_merge_cells','mceButtonDisabled',true);if(tinyMCE.getParentElement(node,"tr"))tinyMCE.switchClassSticky(editor_id+'_row_props','mceButtonSelected',false);if(tdElm=tinyMCE.getParentElement(node,"td")){tinyMCE.switchClassSticky(editor_id+'_cell_props','mceButtonSelected',false);tinyMCE.switchClassSticky(editor_id+'_row_before','mceButtonNormal',false);tinyMCE.switchClassSticky(editor_id+'_row_after','mceButtonNormal',false);tinyMCE.switchClassSticky(editor_id+'_delete_row','mceButtonNormal',false);tinyMCE.switchClassSticky(editor_id+'_col_before','mceButtonNormal',false);tinyMCE.switchClassSticky(editor_id+'_col_after','mceButtonNormal',false);tinyMCE.switchClassSticky(editor_id+'_delete_col','mceButtonNormal',false);colspan=tinyMCE.getAttrib(tdElm,"colspan");rowspan=tinyMCE.getAttrib(tdElm,"rowspan");colspan=colspan==""?"1":colspan;rowspan=rowspan==""?"1":rowspan;if(colspan!="1"||rowspan!="1")tinyMCE.switchClassSticky(editor_id+'_split_cells','mceButtonNormal',false);}if(tinyMCE.getParentElement(node,"table")){tinyMCE.switchClassSticky(editor_id+'_table','mceButtonSelected');tinyMCE.switchClassSticky(editor_id+'_merge_cells','mceButtonNormal',false);}}
\ No newline at end of file

Modified: xwiki/trunk/src/main/web/tiny_mce/plugins/table/editor_plugin_src.js
===================================================================
--- xwiki/trunk/src/main/web/tiny_mce/plugins/table/editor_plugin_src.js	2006-03-27 19:44:45 UTC (rev 990)
+++ xwiki/trunk/src/main/web/tiny_mce/plugins/table/editor_plugin_src.js	2006-03-27 20:26:05 UTC (rev 991)
@@ -1,904 +1,911 @@
-/**
- * $RCSfile: editor_plugin_src.js,v $
- * $Revision: 1.38 $
- * $Date: 2006/02/11 18:53:51 $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
- */
-
 /* Import plugin specific language pack */
-tinyMCE.importPluginLanguagePack('table', 'en,tr,ar,cs,da,de,el,es,fi,fr_ca,hu,it,ja,ko,nl,nb,pl,pt,pt_br,sv,tw,zh_cn,fr,de,he,nb,ru,ru_KOI8-R,ru_UTF-8,nn,cy,is,zh_tw,zh_tw_utf8,sk');
+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');
 
-var TinyMCE_TablePlugin = {
-	getInfo : function() {
-		return {
-			longname : 'Tables',
-			author : 'Moxiecode Systems',
-			authorurl : 'http://tinymce.moxiecode.com',
-			infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_table.html',
-			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
-		};
-	},
+function TinyMCE_table_initInstance(inst) {
+	if (tinyMCE.isGecko)
+		tinyMCE.addEvent(inst.getDoc(), "mouseup", TinyMCE_table_mouseDownHandler);
 
-	initInstance : function(inst) {
-		if (tinyMCE.isGecko) {
-			var doc = inst.getDoc();
-			tinyMCE.addEvent(doc, "mouseup", TinyMCE_TablePlugin._mouseDownHandler);
-		}
+	inst.tableRowClipboard = null;
+}
 
-		inst.tableRowClipboard = null;
-	},
+function TinyMCE_table_mouseDownHandler(e) {
+	var elm = tinyMCE.isMSIE ? event.srcElement : e.target;
+	var focusElm = tinyMCE.selectedInstance.getFocusElement();
 
-	/**
-	 * Returns the HTML contents of the table control.
-	 */
-	getControlHTML : function(control_name) {
-		var controls = new Array(
-			['table', 'table.gif', 'lang_table_desc', 'mceInsertTable', true],
-			['delete_col', 'table_delete_col.gif', 'lang_table_delete_col_desc', 'mceTableDeleteCol'],
-			['delete_row', 'table_delete_row.gif', 'lang_table_delete_row_desc', 'mceTableDeleteRow'],
-			['col_after', 'table_insert_col_after.gif', 'lang_table_col_after_desc', 'mceTableInsertColAfter'],
-			['col_before', 'table_insert_col_before.gif', 'lang_table_col_before_desc', 'mceTableInsertColBefore'],
-			['row_after', 'table_insert_row_after.gif', 'lang_table_row_after_desc', 'mceTableInsertRowAfter'],
-			['row_before', 'table_insert_row_before.gif', 'lang_table_row_before_desc', 'mceTableInsertRowBefore'],
-			['row_props', 'table_row_props.gif', 'lang_table_row_desc', 'mceTableRowProps', true],
-			['cell_props', 'table_cell_props.gif', 'lang_table_cell_desc', 'mceTableCellProps', true],
-			['split_cells', 'table_split_cells.gif', 'lang_table_split_cells_desc', 'mceTableSplitCells', true],
-			['merge_cells', 'table_merge_cells.gif', 'lang_table_merge_cells_desc', 'mceTableMergeCells', true]);
+	// If press on special Mozilla create TD/TR thingie
+	if (elm.nodeName == "BODY" && (focusElm.nodeName == "TD" || (focusElm.parentNode && focusElm.parentNode.nodeName == "TD"))) {
+		window.setTimeout(function() {
+			var tableElm = tinyMCE.getParentElement(focusElm, "table");
+			tinyMCE.handleVisualAid(tableElm, true, tinyMCE.settings['visual']);
+		}, 10);
+	}
+}
 
-		// Render table control
-		for (var i=0; i<controls.length; i++) {
-			var but = controls[i];
-			var cmd = 'tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + but[3] + '\', ' + (but.length > 4 ? but[4] : false) + (but.length > 5 ? ', \'' + but[5] + '\'' : '') + ');return false;';
+/**
+ * Returns the HTML contents of the table control.
+ */
+function TinyMCE_table_getControlHTML(control_name) {
+	var controls = new Array(
+		['table', 'table.gif', '{$lang_table_desc}', 'mceInsertTable', true],
+		['delete_col', 'table_delete_col.gif', '{$lang_table_delete_col_desc}', 'mceTableDeleteCol'],
+		['delete_row', 'table_delete_row.gif', '{$lang_table_delete_row_desc}', 'mceTableDeleteRow'],
+		['col_after', 'table_insert_col_after.gif', '{$lang_table_insert_col_after_desc}', 'mceTableInsertColAfter'],
+		['col_before', 'table_insert_col_before.gif', '{$lang_table_insert_col_before_desc}', 'mceTableInsertColBefore'],
+		['row_after', 'table_insert_row_after.gif', '{$lang_table_insert_row_after_desc}', 'mceTableInsertRowAfter'],
+		['row_before', 'table_insert_row_before.gif', '{$lang_table_insert_row_before_desc}', 'mceTableInsertRowBefore'],
+		['row_props', 'table_row_props.gif', '{$lang_table_row_desc}', 'mceTableRowProps', true],
+		['cell_props', 'table_cell_props.gif', '{$lang_table_cell_desc}', 'mceTableCellProps', true],
+		['split_cells', 'table_split_cells.gif', '{$lang_table_split_cells_desc}', 'mceTableSplitCells', true],
+		['merge_cells', 'table_merge_cells.gif', '{$lang_table_merge_cells_desc}', 'mceTableMergeCells', true]);
 
-			if (but[0] == control_name)
-				return tinyMCE.getButtonHTML(control_name, but[2], '{$pluginurl}/images/'+ but[1], but[3], (but.length > 4 ? but[4] : false));
-		}
+	// Render table control
+	for (var i=0; i<controls.length; i++) {
+		var but = controls[i];
+		var safariPatch = '" onclick="';
 
-		// Special tablecontrols
-		if (control_name == "tablecontrols") {
-			var html = "";
+		if (tinyMCE.isSafari)
+			safariPatch = "";
 
-			html += tinyMCE.getControlHTML("table");
-			html += tinyMCE.getControlHTML("separator");
-			html += tinyMCE.getControlHTML("row_props");
-			html += tinyMCE.getControlHTML("cell_props");
-			html += tinyMCE.getControlHTML("separator");
-			html += tinyMCE.getControlHTML("row_before");
-			html += tinyMCE.getControlHTML("row_after");
-			html += tinyMCE.getControlHTML("delete_row");
-			html += tinyMCE.getControlHTML("separator");
-			html += tinyMCE.getControlHTML("col_before");
-			html += tinyMCE.getControlHTML("col_after");
-			html += tinyMCE.getControlHTML("delete_col");
-			html += tinyMCE.getControlHTML("separator");
-			html += tinyMCE.getControlHTML("split_cells");
-			html += tinyMCE.getControlHTML("merge_cells");
+		if (but[0] == control_name && (tinyMCE.isMSIE || !tinyMCE.settings['button_tile_map']))
+			return '<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\');' + safariPatch + 'tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + but[3] + '\', ' + (but.length > 4 ? but[4] : false) + (but.length > 5 ? ', \'' + but[5] + '\'' : '') + ')">';
+		else if (but[0] == control_name)
+			return '<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\');' + safariPatch + 'tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + but[3] + '\', ' + (but.length > 4 ? but[4] : false) + (but.length > 5 ? ', \'' + but[5] + '\'' : '') + ')">';
+	}
 
-			return html;
-		}
+	// Special tablecontrols
+	if (control_name == "tablecontrols") {
+		var html = "";
 
-		return "";
-	},
+		html += tinyMCE.getControlHTML("table");
+		html += tinyMCE.getControlHTML("separator");
+		html += tinyMCE.getControlHTML("row_props");
+		html += tinyMCE.getControlHTML("cell_props");
+		html += tinyMCE.getControlHTML("separator");
+		html += tinyMCE.getControlHTML("row_before");
+		html += tinyMCE.getControlHTML("row_after");
+		html += tinyMCE.getControlHTML("delete_row");
+		html += tinyMCE.getControlHTML("separator");
+		html += tinyMCE.getControlHTML("col_before");
+		html += tinyMCE.getControlHTML("col_after");
+		html += tinyMCE.getControlHTML("delete_col");
+		html += tinyMCE.getControlHTML("separator");
+		html += tinyMCE.getControlHTML("split_cells");
+		html += tinyMCE.getControlHTML("merge_cells");
 
-	/**
-	 * Executes the table commands.
-	 */
-	execCommand : function(editor_id, element, command, user_interface, value) {
-		// Is table command
-		switch (command) {
-			case "mceInsertTable":
-			case "mceTableRowProps":
-			case "mceTableCellProps":
-			case "mceTableSplitCells":
-			case "mceTableMergeCells":
-			case "mceTableInsertRowBefore":
-			case "mceTableInsertRowAfter":
-			case "mceTableDeleteRow":
-			case "mceTableInsertColBefore":
-			case "mceTableInsertColAfter":
-			case "mceTableDeleteCol":
-			case "mceTableCutRow":
-			case "mceTableCopyRow":
-			case "mceTablePasteRowBefore":
-			case "mceTablePasteRowAfter":
-			case "mceTableDelete":
-				var inst = tinyMCE.getInstanceById(editor_id);
+		return html;
+	}
 
-				inst.execCommand('mceBeginUndoLevel');
-				TinyMCE_TablePlugin._doExecCommand(editor_id, element, command, user_interface, value);
-				inst.execCommand('mceEndUndoLevel');
+	return "";
+}
 
+/**
+ * Executes the table commands.
+ */
+function TinyMCE_table_execCommand(editor_id, element, command, user_interface, value) {
+	var inst = tinyMCE.getInstanceById(editor_id);
+	var focusElm = inst.getFocusElement();
+	var trElm = tinyMCE.getParentElement(focusElm, "tr");
+	var tdElm = tinyMCE.getParentElement(focusElm, "td");
+	var tableElm = tinyMCE.getParentElement(focusElm, "table");
+	var doc = inst.contentWindow.document;
+	var tableBorder = tableElm ? tableElm.getAttribute("border") : "";
+
+	// Get first TD if no TD found
+	if (trElm && tdElm == null)
+		tdElm = trElm.cells[0];
+
+	// ------- Inner functions ---------
+	function inArray(ar, v) {
+		for (var i=0; i<ar.length; i++) {
+			// Is array
+			if (ar[i].length > 0 && inArray(ar[i], v))
 				return true;
+
+			// Found value
+			if (ar[i] == v)
+				return true;
 		}
 
-		// Pass to next handler in chain
 		return false;
-	},
+	}
 
-	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
-		var colspan = "1", rowspan = "1";
+	function makeTD() {
+		var newTD = doc.createElement("td");
+		newTD.innerHTML = "&nbsp;";
+	}
 
-		var inst = tinyMCE.getInstanceById(editor_id);
+	function getColRowSpan(td) {
+		var colspan = tinyMCE.getAttrib(td, "colspan");
+		var rowspan = tinyMCE.getAttrib(td, "rowspan");
 
-		// Reset table controls
-		tinyMCE.switchClass(editor_id + '_table', 'mceButtonNormal');
-		tinyMCE.switchClass(editor_id + '_row_props', 'mceButtonDisabled');
-		tinyMCE.switchClass(editor_id + '_cell_props', 'mceButtonDisabled');
-		tinyMCE.switchClass(editor_id + '_row_before', 'mceButtonDisabled');
-		tinyMCE.switchClass(editor_id + '_row_after', 'mceButtonDisabled');
-		tinyMCE.switchClass(editor_id + '_delete_row', 'mceButtonDisabled');
-		tinyMCE.switchClass(editor_id + '_col_before', 'mceButtonDisabled');
-		tinyMCE.switchClass(editor_id + '_col_after', 'mceButtonDisabled');
-		tinyMCE.switchClass(editor_id + '_delete_col', 'mceButtonDisabled');
-		tinyMCE.switchClass(editor_id + '_split_cells', 'mceButtonDisabled');
-		tinyMCE.switchClass(editor_id + '_merge_cells', 'mceButtonDisabled');
+		colspan = colspan == "" ? 1 : parseInt(colspan);
+		rowspan = rowspan == "" ? 1 : parseInt(rowspan);
 
-		// Within a td element
-		if (tdElm = tinyMCE.getParentElement(node, "td,th")) {
-			tinyMCE.switchClass(editor_id + '_cell_props', 'mceButtonSelected');
-			tinyMCE.switchClass(editor_id + '_row_before', 'mceButtonNormal');
-			tinyMCE.switchClass(editor_id + '_row_after', 'mceButtonNormal');
-			tinyMCE.switchClass(editor_id + '_delete_row', 'mceButtonNormal');
-			tinyMCE.switchClass(editor_id + '_col_before', 'mceButtonNormal');
-			tinyMCE.switchClass(editor_id + '_col_after', 'mceButtonNormal');
-			tinyMCE.switchClass(editor_id + '_delete_col', 'mceButtonNormal');
+		return {colspan : colspan, rowspan : rowspan};
+	}
 
-			colspan = tinyMCE.getAttrib(tdElm, "colspan");
-			rowspan = tinyMCE.getAttrib(tdElm, "rowspan");
-
-			colspan = colspan == "" ? "1" : colspan;
-			rowspan = rowspan == "" ? "1" : rowspan;
-
-			if (colspan != "1" || rowspan != "1")
-				tinyMCE.switchClass(editor_id + '_split_cells', 'mceButtonNormal');
+	function getCellPos(grid, td) {
+		for (var y=0; y<grid.length; y++) {
+			for (var x=0; x<grid[y].length; x++) {
+				if (grid[y][x] == td)
+					return {cellindex : x, rowindex : y};
+			}
 		}
 
-		// Within a tr element
-		if (tinyMCE.getParentElement(node, "tr"))
-			tinyMCE.switchClass(editor_id + '_row_props', 'mceButtonSelected');
+		return null;
+	}
 
-		// Within table
-		if (tinyMCE.getParentElement(node, "table")) {
-			tinyMCE.switchClass(editor_id + '_table', 'mceButtonSelected');
-			tinyMCE.switchClass(editor_id + '_merge_cells', 'mceButtonNormal');
-		}
-	},
+	function getCell(grid, row, col) {
+		if (grid[row] && grid[row][col])
+			return grid[row][col];
 
-	// Private plugin internal methods
+		return null;
+	}
 
-	_mouseDownHandler : function(e) {
-		var elm = tinyMCE.isMSIE ? event.srcElement : e.target;
-		var focusElm = tinyMCE.selectedInstance.getFocusElement();
+	function getTableGrid(table) {
+		var grid = new Array();
+		var rows = table.rows;
 
-		// If press on special Mozilla create TD/TR thingie
-		if (elm.nodeName == "BODY" && (focusElm.nodeName == "TD" || focusElm.nodeName == "TH" || (focusElm.parentNode && focusElm.parentNode.nodeName == "TD") ||(focusElm.parentNode && focusElm.parentNode.nodeName == "TH") )) {
-			window.setTimeout(function() {
-				var tableElm = tinyMCE.getParentElement(focusElm, "table");
-				tinyMCE.handleVisualAid(tableElm, true, tinyMCE.settings['visual'], tinyMCE.selectedInstance);
-			}, 10);
-		}
-	},
+		for (var y=0; y<rows.length; y++) {
+			for (var x=0; x<rows[y].cells.length; x++) {
+				var td = rows[y].cells[x];
+				var sd = getColRowSpan(td);
 
-	/**
-	 * Executes the table commands.
-	 */
-	_doExecCommand : function(editor_id, element, command, user_interface, value) {
-		var inst = tinyMCE.getInstanceById(editor_id);
-		var focusElm = inst.getFocusElement();
-		var trElm = tinyMCE.getParentElement(focusElm, "tr");
-		var tdElm = tinyMCE.getParentElement(focusElm, "td,th");
-		var tableElm = tinyMCE.getParentElement(focusElm, "table");
-		var doc = inst.contentWindow.document;
-		var tableBorder = tableElm ? tableElm.getAttribute("border") : "";
+				// All ready filled
+				for (xstart = x; grid[y] && grid[y][xstart]; xstart++) ;
 
-		// Get first TD if no TD found
-		if (trElm && tdElm == null)
-			tdElm = trElm.cells[0];
+				// Fill box
+				for (var y2=y; y2<y+sd['rowspan']; y2++) {
+					if (!grid[y2])
+						grid[y2] = new Array();
 
-		// ------- Inner functions ---------
-		function inArray(ar, v) {
-			for (var i=0; i<ar.length; i++) {
-				// Is array
-				if (ar[i].length > 0 && inArray(ar[i], v))
-					return true;
-
-				// Found value
-				if (ar[i] == v)
-					return true;
+					for (var x2=xstart; x2<xstart+sd['colspan']; x2++) {
+						grid[y2][x2] = td;
+					}
+				}
 			}
-
-			return false;
 		}
 
-		function makeTD() {
-			var newTD = doc.createElement("td");
-			newTD.innerHTML = "&nbsp;";
-		}
+		return grid;
+	}
 
-		function getColRowSpan(td) {
-			var colspan = tinyMCE.getAttrib(td, "colspan");
-			var rowspan = tinyMCE.getAttrib(td, "rowspan");
+	function trimRow(table, tr, td, new_tr) {
+		var grid = getTableGrid(table);
+		var cpos = getCellPos(grid, td);
 
-			colspan = colspan == "" ? 1 : parseInt(colspan);
-			rowspan = rowspan == "" ? 1 : parseInt(rowspan);
+		// Time to crop away some
+		if (new_tr.cells.length != tr.childNodes.length) {
+			var cells = tr.childNodes;
+			var lastElm = null;
 
-			return {colspan : colspan, rowspan : rowspan};
-		}
+			for (var x=0; td = getCell(grid, cpos.rowindex, x); x++) {
+				var remove = true;
+				var sd = getColRowSpan(td);
 
-		function getCellPos(grid, td) {
-			for (var y=0; y<grid.length; y++) {
-				for (var x=0; x<grid[y].length; x++) {
-					if (grid[y][x] == td)
-						return {cellindex : x, rowindex : y};
+				// Remove due to rowspan
+				if (inArray(cells, td)) {
+					new_tr.childNodes[x]._delete = true;
+				} else if ((lastElm == null || td != lastElm) && sd.colspan > 1) { // Remove due to colspan
+					for (var i=x; i<x+td.colSpan; i++)
+						new_tr.childNodes[i]._delete = true;
 				}
+
+				if ((lastElm == null || td != lastElm) && sd.rowspan > 1)
+					td.rowSpan = sd.rowspan + 1;
+
+				lastElm = td;
 			}
 
-			return null;
+			deleteMarked(tableElm);
 		}
+	}
 
-		function getCell(grid, row, col) {
-			if (grid[row] && grid[row][col])
-				return grid[row][col];
+	function prevElm(node, name) {
+		while ((node = node.previousSibling) != null) {
+			if (node.nodeName == name)
+				return node;
+		}
 
-			return null;
+		return null;
+	}
+
+	function nextElm(node, name) {
+		while ((node = node.nextSibling) != null) {
+			if (node.nodeName == name)
+				return node;
 		}
 
-		function getTableGrid(table) {
-			var grid = new Array();
-			var rows = table.rows;
+		return null;
+	}
 
-			for (var y=0; y<rows.length; y++) {
-				for (var x=0; x<rows[y].cells.length; x++) {
-					var td = rows[y].cells[x];
-					var sd = getColRowSpan(td);
+	function deleteMarked(tbl) {
+		if (tbl.rows == 0)
+			return;
 
-					// All ready filled
-					for (xstart = x; grid[y] && grid[y][xstart]; xstart++) ;
+		var tr = tbl.rows[0];
+		do {
+			var next = nextElm(tr, "TR");
 
-					// Fill box
-					for (var y2=y; y2<y+sd['rowspan']; y2++) {
-						if (!grid[y2])
-							grid[y2] = new Array();
+			// Delete row
+			if (tr._delete) {
+				tr.parentNode.removeChild(tr);
+				continue;
+			}
 
-						for (var x2=xstart; x2<xstart+sd['colspan']; x2++) {
-							grid[y2][x2] = td;
-						}
-					}
-				}
+			// Delete cells
+			var td = tr.cells[0];
+			if (td.cells > 1) {
+				do {
+					var nexttd = nextElm(td, "TD");
+
+					if (td._delete)
+						td.parentNode.removeChild(td);
+				} while ((td = nexttd) != null);
 			}
+		} while ((tr = next) != null);
+	}
 
-			return grid;
+	function addRows(td_elm, tr_elm, rowspan) {
+		// Add rows
+		td_elm.rowSpan = 1;
+		var trNext = nextElm(tr_elm, "TR");
+		for (var i=1; i<rowspan && trNext; i++) {
+			var newTD = doc.createElement("td");
+			newTD.innerHTML = "&nbsp;";
+
+			if (tinyMCE.isMSIE)
+				trNext.insertBefore(newTD, trNext.cells(td_elm.cellIndex));
+			else
+				trNext.insertBefore(newTD, trNext.cells[td_elm.cellIndex]);
+
+			trNext = nextElm(trNext, "TR");
 		}
+	}
 
-		function trimRow(table, tr, td, new_tr) {
-			var grid = getTableGrid(table);
-			var cpos = getCellPos(grid, td);
+	function copyRow(doc, table, tr) {
+		var grid = getTableGrid(table);
+		var newTR = tr.cloneNode(false);
+		var cpos = getCellPos(grid, tr.cells[0]);
+		var lastCell = null;
+		var tableBorder = tinyMCE.getAttrib(table, "border");
+		var tdElm = null;
 
-			// Time to crop away some
-			if (new_tr.cells.length != tr.childNodes.length) {
-				var cells = tr.childNodes;
-				var lastElm = null;
+		for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+			var newTD = null;
 
-				for (var x=0; td = getCell(grid, cpos.rowindex, x); x++) {
-					var remove = true;
-					var sd = getColRowSpan(td);
-
-					// Remove due to rowspan
-					if (inArray(cells, td)) {
-						new_tr.childNodes[x]._delete = true;
-					} else if ((lastElm == null || td != lastElm) && sd.colspan > 1) { // Remove due to colspan
-						for (var i=x; i<x+td.colSpan; i++)
-							new_tr.childNodes[i]._delete = true;
+			if (lastCell != tdElm) {
+				for (var i=0; i<tr.cells.length; i++) {
+					if (tdElm == tr.cells[i]) {
+						newTD = tdElm.cloneNode(true);
+						break;
 					}
-
-					if ((lastElm == null || td != lastElm) && sd.rowspan > 1)
-						td.rowSpan = sd.rowspan + 1;
-
-					lastElm = td;
 				}
-
-				deleteMarked(tableElm);
 			}
-		}
 
-		function prevElm(node, name) {
-			while ((node = node.previousSibling) != null) {
-				if (node.nodeName == name)
-					return node;
+			if (newTD == null) {
+				newTD = doc.createElement("td");
+				newTD.innerHTML = "&nbsp;";
 			}
 
-			return null;
-		}
+			// Reset col/row span
+			newTD.colSpan = 1;
+			newTD.rowSpan = 1;
 
-		function nextElm(node, names) {
-			var namesAr = names.split(',');
+			newTR.appendChild(newTD);
 
-			while ((node = node.nextSibling) != null) {
-				for (var i=0; i<namesAr.length; i++) {
-					if (node.nodeName.toLowerCase() == namesAr[i].toLowerCase() )
-						return node;
-				}
-			}
-
-			return null;
+			lastCell = tdElm;
 		}
 
-		function deleteMarked(tbl) {
-			if (tbl.rows == 0)
-				return;
+		return newTR;
+	}
 
-			var tr = tbl.rows[0];
-			do {
-				var next = nextElm(tr, "TR");
+	// ---- Commands -----
 
-				// Delete row
-				if (tr._delete) {
-					tr.parentNode.removeChild(tr);
-					continue;
-				}
+	// Handle commands
+	switch (command) {
+		case "mceTableRowProps":
+			if (trElm == null)
+				return true;
 
-				// Delete cells
-				var td = tr.cells[0];
-				if (td.cells > 1) {
-					do {
-						var nexttd = nextElm(td, "TD,TH");
+			if (user_interface) {
+				// Setup template
+				var template = new Array();
 
-						if (td._delete)
-							td.parentNode.removeChild(td);
-					} while ((td = nexttd) != null);
+				template['file'] = '../../plugins/table/row.htm';
+
+				if (tinyMCE.settings['table_color_fields']) {
+					template['width'] = 400;
+					template['height'] = 220;
+				} else {
+					template['width'] = 340;
+					template['height'] = 220;
 				}
-			} while ((tr = next) != null);
-		}
 
-		function addRows(td_elm, tr_elm, rowspan) {
-			// Add rows
-			td_elm.rowSpan = 1;
-			var trNext = nextElm(tr_elm, "TR");
-			for (var i=1; i<rowspan && trNext; i++) {
-				var newTD = doc.createElement("td");
-				newTD.innerHTML = "&nbsp;";
+				// Open window
+				tinyMCE.openWindow(template, {editor_id : inst.editorId, align : tinyMCE.getAttrib(trElm, 'align'), valign : tinyMCE.getAttrib(trElm, 'valign'), height : tinyMCE.getAttrib(trElm, 'height'), className : tinyMCE.getVisualAidClass(tinyMCE.getAttrib(trElm, 'class'), false), bordercolor : tinyMCE.getAttrib(trElm, 'bordercolor'), bgcolor : tinyMCE.getAttrib(trElm, 'bgcolor')});
+			} else {
+				inst.execCommand("mceAddUndoLevel");
 
-				if (tinyMCE.isMSIE)
-					trNext.insertBefore(newTD, trNext.cells(td_elm.cellIndex));
-				else
-					trNext.insertBefore(newTD, trNext.cells[td_elm.cellIndex]);
+				trElm.setAttribute('align', value['align']);
+				trElm.setAttribute('vAlign', value['valign']);
+				trElm.setAttribute('height', value['height']);
+				trElm.setAttribute('bordercolor', value['bordercolor']);
+				trElm.setAttribute('bgcolor', value['bgcolor']);
+				tinyMCE.setAttrib(trElm, 'class', value['className']);
 
-				trNext = nextElm(trNext, "TR");
+				trElm.borderColor = value['bordercolor'];
+				trElm.bgColor = value['bgcolor'];
 			}
-		}
 
-		function copyRow(doc, table, tr) {
-			var grid = getTableGrid(table);
-			var newTR = tr.cloneNode(false);
-			var cpos = getCellPos(grid, tr.cells[0]);
-			var lastCell = null;
-			var tableBorder = tinyMCE.getAttrib(table, "border");
-			var tdElm = null;
+			tinyMCE.triggerNodeChange();
+			return true;
 
-			for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
-				var newTD = null;
+		case "mceTableCellProps":
+			if (tdElm == null)
+				return true;
 
-				if (lastCell != tdElm) {
-					for (var i=0; i<tr.cells.length; i++) {
-						if (tdElm == tr.cells[i]) {
-							newTD = tdElm.cloneNode(true);
-							break;
-						}
-					}
-				}
+			if (user_interface) {
+				// Setup template
+				var template = new Array();
 
-				if (newTD == null) {
-					newTD = doc.createElement("td");
-					newTD.innerHTML = "&nbsp;";
+				template['file'] = '../../plugins/table/cell.htm';
+
+				if (tinyMCE.settings['table_color_fields']) {
+					template['width'] = 400;
+					template['height'] = 240;
+				} else {
+					template['width'] = 340;
+					template['height'] = 220;
 				}
 
-				// Reset col/row span
-				newTD.colSpan = 1;
-				newTD.rowSpan = 1;
+				// Open window
+				tinyMCE.openWindow(template, {editor_id : inst.editorId, align : tinyMCE.getAttrib(tdElm, 'align'), valign : tinyMCE.getAttrib(tdElm, 'valign'), width : tinyMCE.getAttrib(tdElm, 'width'), height : tinyMCE.getAttrib(tdElm, 'height'), className : tinyMCE.getVisualAidClass(tinyMCE.getAttrib(tdElm, 'class'), false), bordercolor : tinyMCE.getAttrib(tdElm, 'bordercolor'), bgcolor : tinyMCE.getAttrib(tdElm, 'bgcolor')});
+			} else {
+				inst.execCommand("mceAddUndoLevel");
 
-				newTR.appendChild(newTD);
+				tdElm.setAttribute('align', value['align']);
+				tdElm.setAttribute('vAlign', value['valign']);
+				tdElm.setAttribute('width', value['width']);
+				tdElm.setAttribute('height', value['height']);
+				tdElm.setAttribute('bordercolor', value['bordercolor']);
+				tdElm.setAttribute('bgcolor', value['bgcolor']);
+				tinyMCE.setAttrib(tdElm, 'class', tinyMCE.getVisualAidClass(value['className']));
 
-				lastCell = tdElm;
+				tdElm.borderColor = value['bordercolor'];
+				tdElm.bgColor = value['bgcolor'];
 			}
 
-			return newTR;
-		}
+			tinyMCE.triggerNodeChange();
+			return true;
 
-		// ---- Commands -----
+		case "mceInsertTable":
+			if (user_interface) {
+				var cols = 2, rows = 2, border = 0, cellpadding = "", cellspacing = "", align = "", width = "", height = "", bordercolor = "", bgcolor = "", action = "insert", className = "";
 
-		// Handle commands
-		switch (command) {
-			case "mceTableRowProps":
-				if (trElm == null)
-					return true;
+				tinyMCE.tableElm = tinyMCE.getParentElement(inst.getFocusElement(), "table");
 
-				if (user_interface) {
-					// Setup template
-					var template = new Array();
+				if (tinyMCE.tableElm && value != "insert") {
+					var rowsAr = tinyMCE.tableElm.rows;
+					var cols = 0;
+					for (var i=0; i<rowsAr.length; i++)
+						if (rowsAr[i].cells.length > cols)
+							cols = rowsAr[i].cells.length;
 
-					template['file'] = '../../plugins/table/row.htm';
-					template['width'] = 380;
-					template['height'] = 295;
+					cols = cols;
+					rows = rowsAr.length;
 
-					// Language specific width and height addons
-					template['width'] += tinyMCE.getLang('lang_table_rowprops_delta_width', 0);
-					template['height'] += tinyMCE.getLang('lang_table_rowprops_delta_height', 0);
+					border = tinyMCE.getAttrib(tinyMCE.tableElm, 'border', border);
+					cellpadding = tinyMCE.getAttrib(tinyMCE.tableElm, 'cellpadding', "");
+					cellspacing = tinyMCE.getAttrib(tinyMCE.tableElm, 'cellspacing', "");
+					width = tinyMCE.getAttrib(tinyMCE.tableElm, 'width', width);
+					height = tinyMCE.getAttrib(tinyMCE.tableElm, 'height', height);
+					bordercolor = tinyMCE.getAttrib(tinyMCE.tableElm, 'bordercolor', bordercolor);
+					bgcolor = tinyMCE.getAttrib(tinyMCE.tableElm, 'bgcolor', bgcolor);
+					align = tinyMCE.getAttrib(tinyMCE.tableElm, 'align', align);
+					className = tinyMCE.getVisualAidClass(tinyMCE.getAttrib(tinyMCE.tableElm, 'class'), false);
 
-					// Open window
-					tinyMCE.openWindow(template, {editor_id : inst.editorId, inline : "yes"});
+					if (tinyMCE.isMSIE) {
+						width = tinyMCE.tableElm.style.pixelWidth == 0 ? tinyMCE.tableElm.getAttribute("width") : tinyMCE.tableElm.style.pixelWidth;
+						height = tinyMCE.tableElm.style.pixelHeight == 0 ? tinyMCE.tableElm.getAttribute("height") : tinyMCE.tableElm.style.pixelHeight;
+					}
+
+					action = "update";
 				}
 
-				return true;
+				// Setup template
+				var template = new Array();
 
-			case "mceTableCellProps":
-				if (tdElm == null)
-					return true;
+				template['file'] = '../../plugins/table/table.htm';
+				if (tinyMCE.settings['table_color_fields']) {
+					template['width'] = 400;
+					template['height'] = 240;
+				} else {
+					template['width'] = 340;
+					template['height'] = 220;
+				}
 
-				if (user_interface) {
-					// Setup template
-					var template = new Array();
+				// 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['file'] = '../../plugins/table/cell.htm';
-					template['width'] = 380;
-					template['height'] = 295;
+				// Open window
+				tinyMCE.openWindow(template, {editor_id : inst.editorId, cols : cols, rows : rows, border : border, cellpadding : cellpadding, cellspacing : cellspacing, align : align, width : width, height : height, bordercolor : bordercolor, bgcolor : bgcolor, action : action, className : className});
+			} else {
+				var html = '';
+				var cols = 2, rows = 2, border = 0, cellpadding = -1, cellspacing = -1, align, width, height, className, action;
 
-					// Language specific width and height addons
-					template['width'] += tinyMCE.getLang('lang_table_cellprops_delta_width', 0);
-					template['height'] += tinyMCE.getLang('lang_table_cellprops_delta_height', 0);
-
-					// Open window
-					tinyMCE.openWindow(template, {editor_id : inst.editorId, inline : "yes"});
+				if (typeof(value) == 'object') {
+					cols = value['cols'];
+					rows = value['rows'];
+					border = value['border'] != "" ? value['border'] : 0;
+					cellpadding = value['cellpadding'] != "" ? value['cellpadding'] : -1;
+					cellspacing = value['cellspacing'] != "" ? value['cellspacing'] : -1;
+					align = value['align'];
+					width = value['width'];
+					height = value['height'];
+					bordercolor = value['bordercolor'];
+					bgcolor = value['bgcolor'];
+					className = value['className'];
+					action = value['action'];
 				}
 
-				return true;
+				// Update table
+				if (tinyMCE.tableElm && action == "update") {
+                    inst.execCommand("mceAddUndoLevel");
 
-			case "mceInsertTable":
-				if (user_interface) {
-					// Setup template
-					var template = new Array();
+					tinyMCE.setAttrib(tinyMCE.tableElm, 'cellPadding', cellpadding, true);
+					tinyMCE.setAttrib(tinyMCE.tableElm, 'cellSpacing', cellspacing, true);
+					tinyMCE.setAttrib(tinyMCE.tableElm, 'border', border, true);
+					tinyMCE.setAttrib(tinyMCE.tableElm, 'width', width, true);
+					tinyMCE.setAttrib(tinyMCE.tableElm, 'height', height, true);
+					tinyMCE.setAttrib(tinyMCE.tableElm, 'bordercolor', bordercolor);
+					tinyMCE.setAttrib(tinyMCE.tableElm, 'bgcolor', bgcolor);
+					tinyMCE.setAttrib(tinyMCE.tableElm, 'align', align);
+					tinyMCE.setAttrib(tinyMCE.tableElm, 'class', className);
 
-					template['file'] = '../../plugins/table/table.htm';
-					template['width'] = 380;
-					template['height'] = 295;
+					if (tinyMCE.isMSIE) {
+						tinyMCE.tableElm.style.pixelWidth = (width == null || width == "") ? 0 : width;
+						tinyMCE.tableElm.style.pixelHeight = (height == null || height == "") ? 0 : height;
+						tinyMCE.tableElm.borderColor = bordercolor;
+						tinyMCE.tableElm.bgColor = bgcolor;
+					}
 
-					// Language specific width and height addons
-					template['width'] += tinyMCE.getLang('lang_table_table_delta_width', 0);
-					template['height'] += tinyMCE.getLang('lang_table_table_delta_height', 0);
+					tinyMCE.handleVisualAid(tinyMCE.tableElm, false, inst.visualAid);
 
-					// Open window
-					tinyMCE.openWindow(template, {editor_id : inst.editorId, inline : "yes", action : value});
-				}
+					// Fix for stange MSIE align bug
+					tinyMCE.tableElm.outerHTML = tinyMCE.tableElm.outerHTML;
 
-				return true;
+					//inst.contentWindow.dispatchEvent(createEvent("click"));
 
-			case "mceTableDelete":
-				var table = tinyMCE.getParentElement(inst.getFocusElement(), "table");
-				if (table) {
-					table.parentNode.removeChild(table);
-					inst.repaint();
+					tinyMCE.triggerNodeChange();
+					return true;
 				}
-				return true;
 
-			case "mceTableSplitCells":
-			case "mceTableMergeCells":
-			case "mceTableInsertRowBefore":
-			case "mceTableInsertRowAfter":
-			case "mceTableDeleteRow":
-			case "mceTableInsertColBefore":
-			case "mceTableInsertColAfter":
-			case "mceTableDeleteCol":
-			case "mceTableCutRow":
-			case "mceTableCopyRow":
-			case "mceTablePasteRowBefore":
-			case "mceTablePasteRowAfter":
-				// No table just return (invalid command)
-				if (!tableElm)
-					return true;
+				// Create new table
+				html += '<table border="' + border + '" ';
 
-				// Table has a tbody use that reference
-				// Changed logic by ApTest 2005.07.12 (www.aptest.com)
-				// Now lookk at the focused element and take its parentNode.  That will be a tbody or a table.
-				if (tableElm != trElm.parentNode)
-					tableElm = trElm.parentNode;
+				if (cellpadding != -1)
+					html += 'cellpadding="' + cellpadding + '" ';
 
-				if (tableElm && trElm) {
-					switch (command) {
-						case "mceTableInsertRowBefore":
-							if (!trElm || !tdElm)
-								return true;
+				if (cellspacing != -1)
+					html += 'cellspacing="' + cellspacing + '" ';
 
-							var grid = getTableGrid(tableElm);
-							var cpos = getCellPos(grid, tdElm);
-							var newTR = doc.createElement("tr");
-							var lastTDElm = null;
+				if (width != 0 && width != "")
+					html += 'width="' + width + '" ';
 
-							cpos.rowindex--;
-							if (cpos.rowindex < 0)
-								cpos.rowindex = 0;
+				if (height != 0 && height != "")
+					html += 'height="' + height + '" ';
 
-							// Create cells
-							for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
-								if (tdElm != lastTDElm) {
-									var sd = getColRowSpan(tdElm);
+				if (bordercolor != 0 && bordercolor != "")
+					html += 'bordercolor="' + bordercolor + '" ';
 
-									if (sd['rowspan'] == 1) {
-										var newTD = doc.createElement("td");
+				if (bgcolor != 0 && bgcolor != "")
+					html += 'bgcolor="' + bgcolor + '" ';
 
-										newTD.innerHTML = "&nbsp;";
-										newTD.colSpan = tdElm.colSpan;
+				if (align)
+					html += 'align="' + align + '" ';
 
-										newTR.appendChild(newTD);
-									} else
-										tdElm.rowSpan = sd['rowspan'] + 1;
+				if (className)
+					html += 'class="' + tinyMCE.getVisualAidClass(className, border == 0) + '" ';
 
-									lastTDElm = tdElm;
-								}
-							}
+				html += '>';
 
-							trElm.parentNode.insertBefore(newTR, trElm);
-						break;
+                for (var y=0; y<rows; y++) {
+                    if (y == 0 ) {
+                        html += "<tr>";
 
-						case "mceTableCutRow":
-							if (!trElm || !tdElm)
-								return true;
+                        for (var x=0; x<cols; x++)
+                            html += '<td>&nbsp;</td>';
 
-							inst.tableRowClipboard = copyRow(doc, tableElm, trElm);
-							inst.execCommand("mceTableDeleteRow");
-							break;
+                        html += "</tr>";
+                    } else {
+                        html += "<tr>";
 
-						case "mceTableCopyRow":
-							if (!trElm || !tdElm)
-								return true;
+                        for (var x=0; x<cols; x++)
+                            html += '<td>&nbsp;</td>';
 
-							inst.tableRowClipboard = copyRow(doc, tableElm, trElm);
-							break;
+                        html += "</tr>";
+                    }
+                }
 
-						case "mceTablePasteRowBefore":
-							if (!trElm || !tdElm)
-								return true;
+				html += "</table>";
 
-							var newTR = inst.tableRowClipboard.cloneNode(true);
+				inst.execCommand('mceInsertContent', false, html);
+				//tinyMCE.handleVisualAid(inst.getBody(), true, tinyMCE.settings['visual']);
+			}
 
-							var prevTR = prevElm(trElm, "TR");
-							if (prevTR != null)
-								trimRow(tableElm, prevTR, prevTR.cells[0], newTR);
+			return true;
 
-							trElm.parentNode.insertBefore(newTR, trElm);
-							break;
+		case "mceTableSplitCells":
+		case "mceTableMergeCells":
+		case "mceTableInsertRowBefore":
+		case "mceTableInsertRowAfter":
+		case "mceTableDeleteRow":
+		case "mceTableInsertColBefore":
+		case "mceTableInsertColAfter":
+		case "mceTableDeleteCol":
+		case "mceTableCutRow":
+		case "mceTableCopyRow":
+		case "mceTablePasteRowBefore":
+		case "mceTablePasteRowAfter":
+			inst.execCommand("mceAddUndoLevel");
 
-						case "mceTablePasteRowAfter":
-							if (!trElm || !tdElm)
-								return true;
-							
-							var nextTR = nextElm(trElm, "TR");
-							var newTR = inst.tableRowClipboard.cloneNode(true);
+			// No table just return (invalid command)
+			if (!tableElm)
+				return true;
 
-							trimRow(tableElm, trElm, tdElm, newTR);
+			// Table has a tbody use that reference
+			if (tableElm.firstChild && tableElm.firstChild.nodeName.toLowerCase() == "tbody")
+				tableElm = tableElm.firstChild;
 
-							if (nextTR == null)
-								trElm.parentNode.appendChild(newTR);
-							else
-								nextTR.parentNode.insertBefore(newTR, nextTR);
+			if (tableElm && trElm) {
+				switch (command) {
+					case "mceTableInsertRowBefore":
+						if (!trElm || !tdElm)
+							return true;
 
-							break;
+						var grid = getTableGrid(tableElm);
+						var cpos = getCellPos(grid, tdElm);
+						var newTR = doc.createElement("tr");
+						var lastTDElm = null;
 
-						case "mceTableInsertRowAfter":
-							if (!trElm || !tdElm)
-								return true;
+						cpos.rowindex--;
+						if (cpos.rowindex < 0)
+							cpos.rowindex = 0;
 
-							var grid = getTableGrid(tableElm);
-							var cpos = getCellPos(grid, tdElm);
-							var newTR = doc.createElement("tr");
-							var lastTDElm = null;
+						// Create cells
+						for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+							if (tdElm != lastTDElm) {
+								var sd = getColRowSpan(tdElm);
 
-							// Create cells
-							for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
-								if (tdElm != lastTDElm) {
-									var sd = getColRowSpan(tdElm);
+								if (sd['rowspan'] == 1) {
+									var newTD = doc.createElement("td");
 
-									if (sd['rowspan'] == 1) {
-										var newTD = doc.createElement("td");
+									newTD.innerHTML = "&nbsp;";
+									newTD.colSpan = tdElm.colSpan;
 
-										newTD.innerHTML = "&nbsp;";
-										newTD.colSpan = tdElm.colSpan;
+									newTR.appendChild(newTD);
+								} else
+									tdElm.rowSpan = sd['rowspan'] + 1;
 
-										newTR.appendChild(newTD);
-									} else
-										tdElm.rowSpan = sd['rowspan'] + 1;
-
-									lastTDElm = tdElm;
-								}
+								lastTDElm = tdElm;
 							}
+						}
 
-							if (newTR.hasChildNodes()) {
-								var nextTR = nextElm(trElm, "TR");
-								if (nextTR)
-									nextTR.parentNode.insertBefore(newTR, nextTR);
-								else
-									tableElm.appendChild(newTR);
-							}
-						break;
+						trElm.parentNode.insertBefore(newTR, trElm);
+					break;
 
-						case "mceTableDeleteRow":
-							if (!trElm || !tdElm)
-								return true;
-		
-							var grid = getTableGrid(tableElm);
-							var cpos = getCellPos(grid, tdElm);
+					case "mceTableCutRow":
+						if (!trElm || !tdElm)
+							return true;
 
-							// Only one row, remove whole table
-							if (grid.length == 1) {
-								tableElm.parentNode.removeChild(tableElm);
-								return true;
-							}
+						inst.tableRowClipboard = copyRow(doc, tableElm, trElm);
+						inst.execCommand("mceTableDeleteRow");
+						break;
 
-							// Move down row spanned cells
-							var cells = trElm.cells;
-							var nextTR = nextElm(trElm, "TR");
-							for (var x=0; x<cells.length; x++) {
-								if (cells[x].rowSpan > 1) {
-									var newTD = cells[x].cloneNode(true);
-									var sd = getColRowSpan(cells[x]);
+					case "mceTableCopyRow":
+						if (!trElm || !tdElm)
+							return true;
 
-									newTD.rowSpan = sd.rowspan - 1;
+						inst.tableRowClipboard = copyRow(doc, tableElm, trElm);
+						break;
 
-									var nextTD = nextTR.cells[x];
+					case "mceTablePasteRowBefore":
+						if (!trElm || !tdElm)
+							return true;
 
-									if (nextTD == null)
-										nextTR.appendChild(newTD);
-									else
-										nextTR.insertBefore(newTD, nextTD);
-								}
-							}
+						var newTR = inst.tableRowClipboard.cloneNode(true);
 
-							// Delete cells
-							var lastTDElm = null;
-							for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
-								if (tdElm != lastTDElm) {
-									var sd = getColRowSpan(tdElm);
+						var prevTR = prevElm(trElm, "TR");
+						if (prevTR != null)
+							trimRow(tableElm, prevTR, prevTR.cells[0], newTR);
 
-									if (sd.rowspan > 1) {
-										tdElm.rowSpan = sd.rowspan - 1;
-									} else {
-										trElm = tdElm.parentNode;
+						trElm.parentNode.insertBefore(newTR, trElm);
+						break;
 
-										if (trElm.parentNode)
-											trElm._delete = true;
-									}
+					case "mceTablePasteRowAfter":
+						if (!trElm || !tdElm)
+							return true;
 
-									lastTDElm = tdElm;
-								}
-							}
+						var nextTR = nextElm(trElm, "TR");
+						var newTR = inst.tableRowClipboard.cloneNode(true);
 
-							deleteMarked(tableElm);
+						trimRow(tableElm, trElm, tdElm, newTR);
 
-							cpos.rowindex--;
-							if (cpos.rowindex < 0)
-								cpos.rowindex = 0;
+						if (nextTR == null)
+							trElm.parentNode.appendChild(newTR);
+						else
+							nextTR.parentNode.insertBefore(newTR, nextTR);
 
-							inst.selection.selectNode(getCell(grid, cpos.rowindex, 0), true, true);
 						break;
 
-						case "mceTableInsertColBefore":
-							if (!trElm || !tdElm)
-								return true;
+					case "mceTableInsertRowAfter":
+						if (!trElm || !tdElm)
+							return true;
 
-							var grid = getTableGrid(tableElm);
-							var cpos = getCellPos(grid, tdElm);
-							var lastTDElm = null;
+						var grid = getTableGrid(tableElm);
+						var cpos = getCellPos(grid, tdElm);
+						var newTR = doc.createElement("tr");
+						var lastTDElm = null;
 
-							for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
-								if (tdElm != lastTDElm) {
-									var sd = getColRowSpan(tdElm);
+						// Create cells
+						for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+							if (tdElm != lastTDElm) {
+								var sd = getColRowSpan(tdElm);
 
-									if (sd['colspan'] == 1) {
-										var newTD = doc.createElement(tdElm.nodeName);
+								if (sd['rowspan'] == 1) {
+									var newTD = doc.createElement("td");
 
-										newTD.innerHTML = "&nbsp;";
-										newTD.rowSpan = tdElm.rowSpan;
+									newTD.innerHTML = "&nbsp;";
+									newTD.colSpan = tdElm.colSpan;
 
-										tdElm.parentNode.insertBefore(newTD, tdElm);
-									} else
-										tdElm.colSpan++;
+									newTR.appendChild(newTD);
+								} else
+									tdElm.rowSpan = sd['rowspan'] + 1;
 
-									lastTDElm = tdElm;
-								}
+								lastTDElm = tdElm;
 							}
-						break;
+						}
 
-						case "mceTableInsertColAfter":
-							if (!trElm || !tdElm)
-								return true;
+						if (newTR.hasChildNodes()) {
+							var nextTR = nextElm(trElm, "TR");
+							if (nextTR)
+								nextTR.parentNode.insertBefore(newTR, nextTR);
+							else
+								tableElm.appendChild(newTR);
+						}
+					break;
 
-							var grid = getTableGrid(tableElm);
-							var cpos = getCellPos(grid, tdElm);
-							var lastTDElm = null;
+					case "mceTableDeleteRow":
+						if (!trElm || !tdElm)
+							return true;
 
-							for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
-								if (tdElm != lastTDElm) {
-									var sd = getColRowSpan(tdElm);
+						var grid = getTableGrid(tableElm);
+						var cpos = getCellPos(grid, tdElm);
 
-									if (sd['colspan'] == 1) {
-										var newTD = doc.createElement(tdElm.nodeName);
+						// Only one row, remove whole table
+						if (grid.length == 1) {
+							tableElm.parentNode.removeChild(tableElm);
+							return true;
+						}
 
-										newTD.innerHTML = "&nbsp;";
-										newTD.rowSpan = tdElm.rowSpan;
+						// Move down row spanned cells
+						var cells = trElm.cells;
+						var nextTR = nextElm(trElm, "TR");
+						for (var x=0; x<cells.length; x++) {
+							if (cells[x].rowSpan > 1) {
+								var newTD = cells[x].cloneNode(true);
+								var sd = getColRowSpan(cells[x]);
 
-										var nextTD = nextElm(tdElm, "TD,TH");
-										if (nextTD == null)
-											tdElm.parentNode.appendChild(newTD);
-										else
-											nextTD.parentNode.insertBefore(newTD, nextTD);
-									} else
-										tdElm.colSpan++;
+								newTD.rowSpan = sd.rowspan - 1;
 
-									lastTDElm = tdElm;
-								}
+								var nextTD = nextTR.cells[x];
+
+								if (nextTD == null)
+									nextTR.appendChild(newTD);
+								else
+									nextTR.insertBefore(newTD, nextTD);
 							}
-						break;
+						}
 
-						case "mceTableDeleteCol":
-							if (!trElm || !tdElm)
-								return true;
+						// Delete cells
+						var lastTDElm = null;
+						for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+							if (tdElm != lastTDElm) {
+								var sd = getColRowSpan(tdElm);
 
-							var grid = getTableGrid(tableElm);
-							var cpos = getCellPos(grid, tdElm);
-							var lastTDElm = null;
+								if (sd.rowspan > 1) {
+									tdElm.rowSpan = sd.rowspan - 1;
+								} else {
+									trElm = tdElm.parentNode;
 
-							// Only one col, remove whole table
-							if (grid.length > 1 && grid[0].length <= 1) {
-								tableElm.parentNode.removeChild(tableElm);
-								return true;
+									if (trElm.parentNode)
+										trElm._delete = true;
+								}
+
+								lastTDElm = tdElm;
 							}
+						}
 
-							// Delete cells
-							for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
-								if (tdElm != lastTDElm) {
-									var sd = getColRowSpan(tdElm);
+						deleteMarked(tableElm);
 
-									if (sd['colspan'] > 1)
-										tdElm.colSpan = sd['colspan'] - 1;
-									else {
-										if (tdElm.parentNode)
-											tdElm.parentNode.removeChild(tdElm);
-									}
+						cpos.rowindex--;
+						if (cpos.rowindex < 0)
+							cpos.rowindex = 0;
 
-									lastTDElm = tdElm;
-								}
-							}
+						inst.selectNode(getCell(grid, cpos.rowindex, 0), true, true);
+					break;
 
-							cpos.cellindex--;
-							if (cpos.cellindex < 0)
-								cpos.cellindex = 0;
+					case "mceTableInsertColBefore":
+						if (!trElm || !tdElm)
+							return true;
 
-							inst.selection.selectNode(getCell(grid, 0, cpos.cellindex), true, true);
-						break;
+						var grid = getTableGrid(tableElm);
+						var cpos = getCellPos(grid, tdElm);
+						var lastTDElm = null;
 
-					case "mceTableSplitCells":
+						for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
+							if (tdElm != lastTDElm) {
+								var sd = getColRowSpan(tdElm);
+
+								if (sd['colspan'] == 1) {
+									var newTD = doc.createElement("td");
+
+									newTD.innerHTML = "&nbsp;";
+									newTD.rowSpan = tdElm.rowSpan;
+
+									tdElm.parentNode.insertBefore(newTD, tdElm);
+								} else
+									tdElm.colSpan++;
+
+								lastTDElm = tdElm;
+							}
+						}
+					break;
+
+					case "mceTableInsertColAfter":
 						if (!trElm || !tdElm)
 							return true;
 
-						var spandata = getColRowSpan(tdElm);
+						var grid = getTableGrid(tableElm);
+						var cpos = getCellPos(grid, tdElm);
+						var lastTDElm = null;
 
-						var colspan = spandata["colspan"];
-						var rowspan = spandata["rowspan"];
+						for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
+							if (tdElm != lastTDElm) {
+								var sd = getColRowSpan(tdElm);
 
-						// Needs splitting
-						if (colspan > 1 || rowspan > 1) {
-							// Generate cols
-							tdElm.colSpan = 1;
-							for (var i=1; i<colspan; i++) {
-								var newTD = doc.createElement("td");
+								if (sd['colspan'] == 1) {
+									var newTD = doc.createElement("td");
 
-								newTD.innerHTML = "&nbsp;";
+									newTD.innerHTML = "&nbsp;";
+									newTD.rowSpan = tdElm.rowSpan;
 
-								trElm.insertBefore(newTD, nextElm(tdElm, "TD,TH"));
+									var nextTD = nextElm(tdElm, "TD");
+									if (nextTD == null)
+										tdElm.parentNode.appendChild(newTD);
+									else
+										nextTD.parentNode.insertBefore(newTD, nextTD);
+								} else
+									tdElm.colSpan++;
 
-								if (rowspan > 1)
-									addRows(newTD, trElm, rowspan);
+								lastTDElm = tdElm;
 							}
-
-							addRows(tdElm, trElm, rowspan);
 						}
+					break;
 
-						// Apply visual aids
-						tableElm = tinyMCE.getParentElement(inst.getFocusElement(), "table");
-						break;
+					case "mceTableDeleteCol":
+						if (!trElm || !tdElm)
+							return true;
 
-					case "mceTableMergeCells":
-						var rows = new Array();
-						var sel = inst.getSel();
 						var grid = getTableGrid(tableElm);
+						var cpos = getCellPos(grid, tdElm);
+						var lastTDElm = null;
 
-						if (tinyMCE.isMSIE || sel.rangeCount == 1) {
-							if (user_interface) {
-								// Setup template
-								var template = new Array();
-								var sp = getColRowSpan(tdElm);
+						// Only one col, remove whole table
+						if (grid.length > 1 && grid[0].length <= 1) {
+							tableElm.parentNode.removeChild(tableElm);
+							return true;
+						}
 
-								template['file'] = '../../plugins/table/merge_cells.htm';
-								template['width'] = 250;
-								template['height'] = 105 + (tinyMCE.isNS7 ? 25 : 0);
+						// Delete cells
+						for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
+							if (tdElm != lastTDElm) {
+								var sd = getColRowSpan(tdElm);
 
-								// 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_delta_height', 0);
+								if (sd['colspan'] > 1)
+									tdElm.colSpan = sd['colspan'] - 1;
+								else {
+									if (tdElm.parentNode)
+										tdElm.parentNode.removeChild(tdElm);
+								}
 
-								// Open window
-								tinyMCE.openWindow(template, {editor_id : inst.editorId, inline : "yes", action : "update", numcols : sp.colspan, numrows : sp.rowspan});
+								lastTDElm = tdElm;
+							}
+						}
 
-								return true;
-							} else {
-								var numRows = parseInt(value['numrows']);
-								var numCols = parseInt(value['numcols']);
-								var cpos = getCellPos(grid, tdElm);
+						cpos.cellindex--;
+						if (cpos.cellindex < 0)
+							cpos.cellindex = 0;
 
-								if (("" + numRows) == "NaN")
-									numRows = 1;
+						inst.selectNode(getCell(grid, 0, cpos.cellindex), true, true);
+					break;
 
-								if (("" + numCols) == "NaN")
-									numCols = 1;
+				case "mceTableSplitCells":
+					if (!trElm || !tdElm)
+						return true;
 
-								// Get rows and cells
-								var tRows = tableElm.rows;
-								for (var y=cpos.rowindex; y<grid.length; y++) {
-									var rowCells = new Array();
+					var spandata = getColRowSpan(tdElm);
 
-									for (var x=cpos.cellindex; x<grid[y].length; x++) {
-										var td = getCell(grid, y, x);
+					var colspan = spandata["colspan"];
+					var rowspan = spandata["rowspan"];
 
-										if (td && !inArray(rows, td) && !inArray(rowCells, td)) {
-											var cp = getCellPos(grid, td);
+					// Needs splitting
+					if (colspan > 1 || rowspan > 1) {
+						// Generate cols
+						tdElm.colSpan = 1;
+						for (var i=1; i<colspan; i++) {
+							var newTD = doc.createElement("td");
 
-											// Within range
-											if (cp.cellindex < cpos.cellindex+numCols && cp.rowindex < cpos.rowindex+numRows)
-												rowCells[rowCells.length] = td;
-										}
-									}
+							newTD.innerHTML = "&nbsp;";
 
-									if (rowCells.length > 0)
-										rows[rows.length] = rowCells;
-								}
+							trElm.insertBefore(newTD, nextElm(tdElm, "TD"));
 
-								//return true;
-							}
-						} else {
-							var cells = new Array();
-							var sel = inst.getSel();
-							var lastTR = null;
-							var curRow = null;
-							var x1 = -1, y1 = -1, x2, y2;
+							if (rowspan > 1)
+								addRows(newTD, trElm, rowspan);
+						}
 
-							// Only one cell selected, whats the point?
-							if (sel.rangeCount < 2)
-								return true;
+						addRows(tdElm, trElm, rowspan);
+					}
 
-							// Get all selected cells
-							for (var i=0; i<sel.rangeCount; i++) {
-								var rng = sel.getRangeAt(i);
-								var tdElm = rng.startContainer.childNodes[rng.startOffset];
+					// Apply visual aids
+					tableElm = tinyMCE.getParentElement(inst.getFocusElement(), "table");
+					break;
 
-								if (!tdElm)
-									break;
+				case "mceTableMergeCells":
+					var rows = new Array();
+					var sel = inst.getSel();
+					var grid = getTableGrid(tableElm);
 
-								if (tdElm.nodeName == "TD")
-									cells[cells.length] = tdElm;
-							}
+					if (tinyMCE.isMSIE || sel.rangeCount == 1) {
+						if (user_interface) {
+							// Setup template
+							var template = new Array();
+							var sp = getColRowSpan(tdElm);
 
+							template['file'] = '../../plugins/table/merge_cells.htm';
+							template['width'] = 160;
+							template['height'] = 220;
+
+							// Open window
+							tinyMCE.openWindow(template, {editor_id : inst.editorId, action : "update", numcols : sp.colspan, numrows : sp.rowspan});
+
+							return true;
+						} else {
+							var numRows = parseInt(value['numrows']);
+							var numCols = parseInt(value['numcols']);
+							var cpos = getCellPos(grid, tdElm);
+
+							if (("" + numRows) == "NaN")
+								numRows = 1;
+
+							if (("" + numCols) == "NaN")
+								numCols = 1;
+
 							// Get rows and cells
 							var tRows = tableElm.rows;
-							for (var y=0; y<tRows.length; y++) {
+							for (var y=cpos.rowindex; y<grid.length; y++) {
 								var rowCells = new Array();
 
-								for (var x=0; x<tRows[y].cells.length; x++) {
-									var td = tRows[y].cells[x];
+								for (var x=cpos.cellindex; x<grid[y].length; x++) {
+									var td = getCell(grid, y, x);
 
-									for (var i=0; i<cells.length; i++) {
-										if (td == cells[i]) {
+									if (td && !inArray(rows, td) && !inArray(rowCells, td)) {
+										var cp = getCellPos(grid, td);
+
+										// Within range
+										if (cp.cellindex < cpos.cellindex+numCols && cp.rowindex < cpos.rowindex+numRows)
 											rowCells[rowCells.length] = td;
-										}
 									}
 								}
 
@@ -906,149 +913,239 @@
 									rows[rows.length] = rowCells;
 							}
 
-							// Find selected cells in grid and box
-							var curRow = new Array();
-							var lastTR = null;
-							for (var y=0; y<grid.length; y++) {
-								for (var x=0; x<grid[y].length; x++) {
-									grid[y][x]._selected = false;
+							//return true;
+						}
+					} else {
+						var cells = new Array();
+						var sel = inst.getSel();
+						var lastTR = null;
+						var curRow = null;
+						var x1 = -1, y1 = -1, x2, y2;
 
-									for (var i=0; i<cells.length; i++) {
-										if (grid[y][x] == cells[i]) {
-											// Get start pos
-											if (x1 == -1) {
-												x1 = x;
-												y1 = y;
-											}
+						// Only one cell selected, whats the point?
+						if (sel.rangeCount < 2)
+							return true;
 
-											// Get end pos
-											x2 = x;
-											y2 = y;
+						// Get all selected cells
+						for (var i=0; i<sel.rangeCount; i++) {
+							var rng = sel.getRangeAt(i);
+							var tdElm = rng.startContainer.childNodes[rng.start