]> git.donarmstrong.com Git - roundcube.git/blobdiff - program/js/tiny_mce/plugins/table/editor_plugin_src.js
Imported Upstream version 0.5.2+dfsg
[roundcube.git] / program / js / tiny_mce / plugins / table / editor_plugin_src.js
index 80cf748a305b86bd6bff86a75a006ed0f048286f..442e465c43a31db6ef418bdaa087c030489e7ecf 100644 (file)
 /**\r
- * $Id: editor_plugin_src.js 953 2008-11-04 10:16:50Z spocke $\r
+ * editor_plugin_src.js\r
  *\r
- * @author Moxiecode\r
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.\r
+ * Copyright 2009, Moxiecode Systems AB\r
+ * Released under LGPL License.\r
+ *\r
+ * License: http://tinymce.moxiecode.com/license\r
+ * Contributing: http://tinymce.moxiecode.com/contributing\r
  */\r
 \r
-(function() {\r
+(function(tinymce) {\r
        var each = tinymce.each;\r
 \r
-       tinymce.create('tinymce.plugins.TablePlugin', {\r
-               init : function(ed, url) {\r
-                       var t = this;\r
+       // Checks if the selection/caret is at the start of the specified block element\r
+       function isAtStart(rng, par) {\r
+               var doc = par.ownerDocument, rng2 = doc.createRange(), elm;\r
 \r
-                       t.editor = ed;\r
-                       t.url = url;\r
+               rng2.setStartBefore(par);\r
+               rng2.setEnd(rng.endContainer, rng.endOffset);\r
 \r
-                       // Register buttons\r
-                       each([\r
-                               ['table', 'table.desc', 'mceInsertTable', true],\r
-                               ['delete_table', 'table.del', 'mceTableDelete'],\r
-                               ['delete_col', 'table.delete_col_desc', 'mceTableDeleteCol'],\r
-                               ['delete_row', 'table.delete_row_desc', 'mceTableDeleteRow'],\r
-                               ['col_after', 'table.col_after_desc', 'mceTableInsertColAfter'],\r
-                               ['col_before', 'table.col_before_desc', 'mceTableInsertColBefore'],\r
-                               ['row_after', 'table.row_after_desc', 'mceTableInsertRowAfter'],\r
-                               ['row_before', 'table.row_before_desc', 'mceTableInsertRowBefore'],\r
-                               ['row_props', 'table.row_desc', 'mceTableRowProps', true],\r
-                               ['cell_props', 'table.cell_desc', 'mceTableCellProps', true],\r
-                               ['split_cells', 'table.split_cells_desc', 'mceTableSplitCells', true],\r
-                               ['merge_cells', 'table.merge_cells_desc', 'mceTableMergeCells', true]\r
-                       ], function(c) {\r
-                               ed.addButton(c[0], {title : c[1], cmd : c[2], ui : c[3]});\r
-                       });\r
+               elm = doc.createElement('body');\r
+               elm.appendChild(rng2.cloneContents());\r
+\r
+               // Check for text characters of other elements that should be treated as content\r
+               return elm.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi, '-').replace(/<[^>]+>/g, '').length == 0;\r
+       };\r
+\r
+       /**\r
+        * Table Grid class.\r
+        */\r
+       function TableGrid(table, dom, selection) {\r
+               var grid, startPos, endPos, selectedCell;\r
+\r
+               buildGrid();\r
+               selectedCell = dom.getParent(selection.getStart(), 'th,td');\r
+               if (selectedCell) {\r
+                       startPos = getPos(selectedCell);\r
+                       endPos = findEndPos();\r
+                       selectedCell = getCell(startPos.x, startPos.y);\r
+               }\r
 \r
-                       if (ed.getParam('inline_styles')) {\r
-                               // Force move of attribs to styles in strict mode\r
-                               ed.onPreProcess.add(function(ed, o) {\r
-                                       var dom = ed.dom;\r
+               function cloneNode(node, children) {\r
+                       node = node.cloneNode(children);\r
+                       node.removeAttribute('id');\r
 \r
-                                       each(dom.select('table', o.node), function(n) {\r
-                                               var v;\r
+                       return node;\r
+               }\r
+\r
+               function buildGrid() {\r
+                       var startY = 0;\r
+\r
+                       grid = [];\r
+\r
+                       each(['thead', 'tbody', 'tfoot'], function(part) {\r
+                               var rows = dom.select('> ' + part + ' tr', table);\r
+\r
+                               each(rows, function(tr, y) {\r
+                                       y += startY;\r
+\r
+                                       each(dom.select('> td, > th', tr), function(td, x) {\r
+                                               var x2, y2, rowspan, colspan;\r
 \r
-                                               if (v = dom.getAttrib(n, 'width')) {\r
-                                                       dom.setStyle(n, 'width', v);\r
-                                                       dom.setAttrib(n, 'width');\r
+                                               // Skip over existing cells produced by rowspan\r
+                                               if (grid[y]) {\r
+                                                       while (grid[y][x])\r
+                                                               x++;\r
                                                }\r
 \r
-                                               if (v = dom.getAttrib(n, 'height')) {\r
-                                                       dom.setStyle(n, 'height', v);\r
-                                                       dom.setAttrib(n, 'height');\r
+                                               // Get col/rowspan from cell\r
+                                               rowspan = getSpanVal(td, 'rowspan');\r
+                                               colspan = getSpanVal(td, 'colspan');\r
+\r
+                                               // Fill out rowspan/colspan right and down\r
+                                               for (y2 = y; y2 < y + rowspan; y2++) {\r
+                                                       if (!grid[y2])\r
+                                                               grid[y2] = [];\r
+\r
+                                                       for (x2 = x; x2 < x + colspan; x2++) {\r
+                                                               grid[y2][x2] = {\r
+                                                                       part : part,\r
+                                                                       real : y2 == y && x2 == x,\r
+                                                                       elm : td,\r
+                                                                       rowspan : rowspan,\r
+                                                                       colspan : colspan\r
+                                                               };\r
+                                                       }\r
                                                }\r
                                        });\r
                                });\r
-                       }\r
 \r
-                       ed.onInit.add(function() {\r
-                               if (ed && ed.plugins.contextmenu) {\r
-                                       ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {\r
-                                               var sm, se = ed.selection, el = se.getNode() || ed.getBody();\r
+                               startY += rows.length;\r
+                       });\r
+               };\r
 \r
-                                               if (ed.dom.getParent(e, 'td') || ed.dom.getParent(e, 'th')) {\r
-                                                       m.removeAll();\r
+               function getCell(x, y) {\r
+                       var row;\r
 \r
-                                                       if (el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) {\r
-                                                               m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});\r
-                                                               m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});\r
-                                                               m.addSeparator();\r
-                                                       }\r
+                       row = grid[y];\r
+                       if (row)\r
+                               return row[x];\r
+               };\r
 \r
-                                                       if (el.nodeName == 'IMG' && el.className.indexOf('mceItem') == -1) {\r
-                                                               m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});\r
-                                                               m.addSeparator();\r
-                                                       }\r
+               function getSpanVal(td, name) {\r
+                       return parseInt(td.getAttribute(name) || 1);\r
+               };\r
 \r
-                                                       m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', ui : true, value : {action : 'insert'}});\r
-                                                       m.add({title : 'table.props_desc', icon : 'table_props', cmd : 'mceInsertTable', ui : true});\r
-                                                       m.add({title : 'table.del', icon : 'delete_table', cmd : 'mceTableDelete', ui : true});\r
-                                                       m.addSeparator();\r
+               function setSpanVal(td, name, val) {\r
+                       if (td) {\r
+                               val = parseInt(val);\r
 \r
-                                                       // Cell menu\r
-                                                       sm = m.addMenu({title : 'table.cell'});\r
-                                                       sm.add({title : 'table.cell_desc', icon : 'cell_props', cmd : 'mceTableCellProps', ui : true});\r
-                                                       sm.add({title : 'table.split_cells_desc', icon : 'split_cells', cmd : 'mceTableSplitCells', ui : true});\r
-                                                       sm.add({title : 'table.merge_cells_desc', icon : 'merge_cells', cmd : 'mceTableMergeCells', ui : true});\r
+                               if (val === 1)\r
+                                       td.removeAttribute(name, 1);\r
+                               else\r
+                                       td.setAttribute(name, val, 1);\r
+                       }\r
+               }\r
 \r
-                                                       // Row menu\r
-                                                       sm = m.addMenu({title : 'table.row'});\r
-                                                       sm.add({title : 'table.row_desc', icon : 'row_props', cmd : 'mceTableRowProps', ui : true});\r
-                                                       sm.add({title : 'table.row_before_desc', icon : 'row_before', cmd : 'mceTableInsertRowBefore'});\r
-                                                       sm.add({title : 'table.row_after_desc', icon : 'row_after', cmd : 'mceTableInsertRowAfter'});\r
-                                                       sm.add({title : 'table.delete_row_desc', icon : 'delete_row', cmd : 'mceTableDeleteRow'});\r
-                                                       sm.addSeparator();\r
-                                                       sm.add({title : 'table.cut_row_desc', icon : 'cut', cmd : 'mceTableCutRow'});\r
-                                                       sm.add({title : 'table.copy_row_desc', icon : 'copy', cmd : 'mceTableCopyRow'});\r
-                                                       sm.add({title : 'table.paste_row_before_desc', icon : 'paste', cmd : 'mceTablePasteRowBefore'});\r
-                                                       sm.add({title : 'table.paste_row_after_desc', icon : 'paste', cmd : 'mceTablePasteRowAfter'});\r
+               function isCellSelected(cell) {\r
+                       return cell && (dom.hasClass(cell.elm, 'mceSelected') || cell == selectedCell);\r
+               };\r
 \r
-                                                       // Column menu\r
-                                                       sm = m.addMenu({title : 'table.col'});\r
-                                                       sm.add({title : 'table.col_before_desc', icon : 'col_before', cmd : 'mceTableInsertColBefore'});\r
-                                                       sm.add({title : 'table.col_after_desc', icon : 'col_after', cmd : 'mceTableInsertColAfter'});\r
-                                                       sm.add({title : 'table.delete_col_desc', icon : 'delete_col', cmd : 'mceTableDeleteCol'});\r
-                                               } else\r
-                                                       m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', ui : true});\r
-                                       });\r
-                               }\r
-                       });\r
+               function getSelectedRows() {\r
+                       var rows = [];\r
 \r
-                       // Add undo level when new rows are created using the tab key\r
-                       ed.onKeyDown.add(function(ed, e) {\r
-                               if (e.keyCode == 9 && ed.dom.getParent(ed.selection.getNode(), 'TABLE')) {\r
-                                       if (!tinymce.isGecko && !tinymce.isOpera) {\r
-                                               tinyMCE.execInstanceCommand(ed.editorId, "mceTableMoveToNextRow", true);\r
-                                               return tinymce.dom.Event.cancel(e);\r
+                       each(table.rows, function(row) {\r
+                               each(row.cells, function(cell) {\r
+                                       if (dom.hasClass(cell, 'mceSelected') || cell == selectedCell.elm) {\r
+                                               rows.push(row);\r
+                                               return false;\r
                                        }\r
-\r
-                                       ed.undoManager.add();\r
-                               }\r
+                               });\r
                        });\r
 \r
-                       // Select whole table is a table border is clicked\r
-                       if (!tinymce.isIE) {\r
-                               if (ed.getParam('table_selection', true)) {\r
-                                       ed.onClick.add(function(ed, e) {\r
-                                               e = e.target;\r
+                       return rows;\r
+               };\r
 \r
-                                               if (e.nodeName === 'TABLE')\r
-                                                       ed.selection.select(e);\r
-                                       });\r
-                               }\r
-                       }\r
+               function deleteTable() {\r
+                       var rng = dom.createRng();\r
 \r
-                       ed.onNodeChange.add(function(ed, cm, n) {\r
-                               var p = ed.dom.getParent(n, 'td,th,caption');\r
+                       rng.setStartAfter(table);\r
+                       rng.setEndAfter(table);\r
 \r
-                               cm.setActive('table', n.nodeName === 'TABLE' || !!p);\r
-                               if (p && p.nodeName === 'CAPTION')\r
-                                       p = null;\r
+                       selection.setRng(rng);\r
 \r
-                               cm.setDisabled('delete_table', !p);\r
-                               cm.setDisabled('delete_col', !p);\r
-                               cm.setDisabled('delete_table', !p);\r
-                               cm.setDisabled('delete_row', !p);\r
-                               cm.setDisabled('col_after', !p);\r
-                               cm.setDisabled('col_before', !p);\r
-                               cm.setDisabled('row_after', !p);\r
-                               cm.setDisabled('row_before', !p);\r
-                               cm.setDisabled('row_props', !p);\r
-                               cm.setDisabled('cell_props', !p);\r
-                               cm.setDisabled('split_cells', !p || (parseInt(ed.dom.getAttrib(p, 'colspan', '1')) < 2 && parseInt(ed.dom.getAttrib(p, 'rowspan', '1')) < 2));\r
-                               cm.setDisabled('merge_cells', !p);\r
-                       });\r
+                       dom.remove(table);\r
+               };\r
 \r
-                       // Padd empty table cells\r
-                       if (!tinymce.isIE) {\r
-                               ed.onBeforeSetContent.add(function(ed, o) {\r
-                                       if (o.initial)\r
-                                               o.content = o.content.replace(/<(td|th)([^>]+|)>\s*<\/(td|th)>/g, tinymce.isOpera ? '<$1$2>&nbsp;</$1>' : '<$1$2><br mce_bogus="1" /></$1>');\r
-                               });\r
-                       }\r
-               },\r
-\r
-               execCommand : function(cmd, ui, val) {\r
-                       var ed = this.editor, b;\r
-\r
-                       // Is table command\r
-                       switch (cmd) {\r
-                               case "mceTableMoveToNextRow":\r
-                               case "mceInsertTable":\r
-                               case "mceTableRowProps":\r
-                               case "mceTableCellProps":\r
-                               case "mceTableSplitCells":\r
-                               case "mceTableMergeCells":\r
-                               case "mceTableInsertRowBefore":\r
-                               case "mceTableInsertRowAfter":\r
-                               case "mceTableDeleteRow":\r
-                               case "mceTableInsertColBefore":\r
-                               case "mceTableInsertColAfter":\r
-                               case "mceTableDeleteCol":\r
-                               case "mceTableCutRow":\r
-                               case "mceTableCopyRow":\r
-                               case "mceTablePasteRowBefore":\r
-                               case "mceTablePasteRowAfter":\r
-                               case "mceTableDelete":\r
-                                       ed.execCommand('mceBeginUndoLevel');\r
-                                       this._doExecCommand(cmd, ui, val);\r
-                                       ed.execCommand('mceEndUndoLevel');\r
-\r
-                                       return true;\r
-                       }\r
+               function cloneCell(cell) {\r
+                       var formatNode;\r
 \r
-                       // Pass to next handler in chain\r
-                       return false;\r
-               },\r
-\r
-               getInfo : function() {\r
-                       return {\r
-                               longname : 'Tables',\r
-                               author : 'Moxiecode Systems AB',\r
-                               authorurl : 'http://tinymce.moxiecode.com',\r
-                               infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table',\r
-                               version : tinymce.majorVersion + "." + tinymce.minorVersion\r
-                       };\r
-               },\r
-\r
-               // Private plugin internal methods\r
-\r
-               /**\r
-                * Executes the table commands.\r
-                */\r
-               _doExecCommand : function(command, user_interface, value) {\r
-                       var inst = this.editor, ed = inst, url = this.url;\r
-                       var focusElm = inst.selection.getNode();\r
-                       var trElm = inst.dom.getParent(focusElm, "tr");\r
-                       var tdElm = inst.dom.getParent(focusElm, "td,th");\r
-                       var tableElm = inst.dom.getParent(focusElm, "table");\r
-                       var doc = inst.contentWindow.document;\r
-                       var tableBorder = tableElm ? tableElm.getAttribute("border") : "";\r
-\r
-                       // Get first TD if no TD found\r
-                       if (trElm && tdElm == null)\r
-                               tdElm = trElm.cells[0];\r
-\r
-                       function inArray(ar, v) {\r
-                               for (var i=0; i<ar.length; i++) {\r
-                                       // Is array\r
-                                       if (ar[i].length > 0 && inArray(ar[i], v))\r
-                                               return true;\r
-\r
-                                       // Found value\r
-                                       if (ar[i] == v)\r
-                                               return true;\r
-                               }\r
+                       // Clone formats\r
+                       tinymce.walk(cell, function(node) {\r
+                               var curNode;\r
 \r
-                               return false;\r
-                       }\r
+                               if (node.nodeType == 3) {\r
+                                       each(dom.getParents(node.parentNode, null, cell).reverse(), function(node) {\r
+                                               node = cloneNode(node, false);\r
 \r
-                       function select(dx, dy) {\r
-                               var td;\r
+                                               if (!formatNode)\r
+                                                       formatNode = curNode = node;\r
+                                               else if (curNode)\r
+                                                       curNode.appendChild(node);\r
 \r
-                               grid = getTableGrid(tableElm);\r
-                               dx = dx || 0;\r
-                               dy = dy || 0;\r
-                               dx = Math.max(cpos.cellindex + dx, 0);\r
-                               dy = Math.max(cpos.rowindex + dy, 0);\r
+                                               curNode = node;\r
+                                       });\r
 \r
-                               // Recalculate grid and select\r
-                               inst.execCommand('mceRepaint');\r
-                               td = getCell(grid, dy, dx);\r
+                                       // Add something to the inner node\r
+                                       if (curNode)\r
+                                               curNode.innerHTML = tinymce.isIE ? '&nbsp;' : '<br data-mce-bogus="1" />';\r
 \r
-                               if (td) {\r
-                                       inst.selection.select(td.firstChild || td);\r
-                                       inst.selection.collapse(1);\r
+                                       return false;\r
                                }\r
-                       };\r
+                       }, 'childNodes');\r
 \r
-                       function makeTD() {\r
-                               var newTD = doc.createElement("td");\r
+                       cell = cloneNode(cell, false);\r
+                       setSpanVal(cell, 'rowSpan', 1);\r
+                       setSpanVal(cell, 'colSpan', 1);\r
 \r
+                       if (formatNode) {\r
+                               cell.appendChild(formatNode);\r
+                       } else {\r
                                if (!tinymce.isIE)\r
-                                       newTD.innerHTML = '<br mce_bogus="1"/>';\r
+                                       cell.innerHTML = '<br data-mce-bogus="1" />';\r
                        }\r
 \r
-                       function getColRowSpan(td) {\r
-                               var colspan = inst.dom.getAttrib(td, "colspan");\r
-                               var rowspan = inst.dom.getAttrib(td, "rowspan");\r
+                       return cell;\r
+               };\r
 \r
-                               colspan = colspan == "" ? 1 : parseInt(colspan);\r
-                               rowspan = rowspan == "" ? 1 : parseInt(rowspan);\r
+               function cleanup() {\r
+                       var rng = dom.createRng();\r
 \r
-                               return {colspan : colspan, rowspan : rowspan};\r
+                       // Empty rows\r
+                       each(dom.select('tr', table), function(tr) {\r
+                               if (tr.cells.length == 0)\r
+                                       dom.remove(tr);\r
+                       });\r
+\r
+                       // Empty table\r
+                       if (dom.select('tr', table).length == 0) {\r
+                               rng.setStartAfter(table);\r
+                               rng.setEndAfter(table);\r
+                               selection.setRng(rng);\r
+                               dom.remove(table);\r
+                               return;\r
                        }\r
 \r
-                       function getCellPos(grid, td) {\r
-                               var x, y;\r
+                       // Empty header/body/footer\r
+                       each(dom.select('thead,tbody,tfoot', table), function(part) {\r
+                               if (part.rows.length == 0)\r
+                                       dom.remove(part);\r
+                       });\r
 \r
-                               for (y=0; y<grid.length; y++) {\r
-                                       for (x=0; x<grid[y].length; x++) {\r
-                                               if (grid[y][x] == td)\r
-                                                       return {cellindex : x, rowindex : y};\r
-                                       }\r
-                               }\r
+                       // Restore selection to start position if it still exists\r
+                       buildGrid();\r
 \r
-                               return null;\r
+                       // Restore the selection to the closest table position\r
+                       row = grid[Math.min(grid.length - 1, startPos.y)];\r
+                       if (row) {\r
+                               selection.select(row[Math.min(row.length - 1, startPos.x)].elm, true);\r
+                               selection.collapse(true);\r
                        }\r
+               };\r
 \r
-                       function getCell(grid, row, col) {\r
-                               if (grid[row] && grid[row][col])\r
-                                       return grid[row][col];\r
+               function fillLeftDown(x, y, rows, cols) {\r
+                       var tr, x2, r, c, cell;\r
 \r
-                               return null;\r
-                       }\r
+                       tr = grid[y][x].elm.parentNode;\r
+                       for (r = 1; r <= rows; r++) {\r
+                               tr = dom.getNext(tr, 'tr');\r
 \r
-                       function getNextCell(table, cell) {\r
-                               var cells = [], x = 0, i, j, cell, nextCell;\r
+                               if (tr) {\r
+                                       // Loop left to find real cell\r
+                                       for (x2 = x; x2 >= 0; x2--) {\r
+                                               cell = grid[y + r][x2].elm;\r
 \r
-                               for (i = 0; i < table.rows.length; i++)\r
-                                       for (j = 0; j < table.rows[i].cells.length; j++, x++)\r
-                                               cells[x] = table.rows[i].cells[j];\r
+                                               if (cell.parentNode == tr) {\r
+                                                       // Append clones after\r
+                                                       for (c = 1; c <= cols; c++)\r
+                                                               dom.insertAfter(cloneCell(cell), cell);\r
+\r
+                                                       break;\r
+                                               }\r
+                                       }\r
 \r
-                               for (i = 0; i < cells.length; i++)\r
-                                       if (cells[i] == cell)\r
-                                               if (nextCell = cells[i+1])\r
-                                                       return nextCell;\r
+                                       if (x2 == -1) {\r
+                                               // Insert nodes before first cell\r
+                                               for (c = 1; c <= cols; c++)\r
+                                                       tr.insertBefore(cloneCell(tr.cells[0]), tr.cells[0]);\r
+                                       }\r
+                               }\r
                        }\r
+               };\r
 \r
-                       function getTableGrid(table) {\r
-                               var grid = [], rows = table.rows, x, y, td, sd, xstart, x2, y2;\r
+               function split() {\r
+                       each(grid, function(row, y) {\r
+                               each(row, function(cell, x) {\r
+                                       var colSpan, rowSpan, newCell, i;\r
 \r
-                               for (y=0; y<rows.length; y++) {\r
-                                       for (x=0; x<rows[y].cells.length; x++) {\r
-                                               td = rows[y].cells[x];\r
-                                               sd = getColRowSpan(td);\r
+                                       if (isCellSelected(cell)) {\r
+                                               cell = cell.elm;\r
+                                               colSpan = getSpanVal(cell, 'colspan');\r
+                                               rowSpan = getSpanVal(cell, 'rowspan');\r
 \r
-                                               // All ready filled\r
-                                               for (xstart = x; grid[y] && grid[y][xstart]; xstart++) ;\r
+                                               if (colSpan > 1 || rowSpan > 1) {\r
+                                                       setSpanVal(cell, 'rowSpan', 1);\r
+                                                       setSpanVal(cell, 'colSpan', 1);\r
 \r
-                                               // Fill box\r
-                                               for (y2=y; y2<y+sd['rowspan']; y2++) {\r
-                                                       if (!grid[y2])\r
-                                                               grid[y2] = [];\r
+                                                       // Insert cells right\r
+                                                       for (i = 0; i < colSpan - 1; i++)\r
+                                                               dom.insertAfter(cloneCell(cell), cell);\r
+\r
+                                                       fillLeftDown(x, y, rowSpan - 1, colSpan);\r
+                                               }\r
+                                       }\r
+                               });\r
+                       });\r
+               };\r
+\r
+               function merge(cell, cols, rows) {\r
+                       var startX, startY, endX, endY, x, y, startCell, endCell, cell, children, count;\r
+\r
+                       // Use specified cell and cols/rows\r
+                       if (cell) {\r
+                               pos = getPos(cell);\r
+                               startX = pos.x;\r
+                               startY = pos.y;\r
+                               endX = startX + (cols - 1);\r
+                               endY = startY + (rows - 1);\r
+                       } else {\r
+                               // Use selection\r
+                               startX = startPos.x;\r
+                               startY = startPos.y;\r
+                               endX = endPos.x;\r
+                               endY = endPos.y;\r
+                       }\r
+\r
+                       // Find start/end cells\r
+                       startCell = getCell(startX, startY);\r
+                       endCell = getCell(endX, endY);\r
+\r
+                       // Check if the cells exists and if they are of the same part for example tbody = tbody\r
+                       if (startCell && endCell && startCell.part == endCell.part) {\r
+                               // Split and rebuild grid\r
+                               split();\r
+                               buildGrid();\r
+\r
+                               // Set row/col span to start cell\r
+                               startCell = getCell(startX, startY).elm;\r
+                               setSpanVal(startCell, 'colSpan', (endX - startX) + 1);\r
+                               setSpanVal(startCell, 'rowSpan', (endY - startY) + 1);\r
+\r
+                               // Remove other cells and add it's contents to the start cell\r
+                               for (y = startY; y <= endY; y++) {\r
+                                       for (x = startX; x <= endX; x++) {\r
+                                               if (!grid[y] || !grid[y][x])\r
+                                                       continue;\r
+\r
+                                               cell = grid[y][x].elm;\r
+\r
+                                               if (cell != startCell) {\r
+                                                       // Move children to startCell\r
+                                                       children = tinymce.grep(cell.childNodes);\r
+                                                       each(children, function(node) {\r
+                                                               startCell.appendChild(node);\r
+                                                       });\r
 \r
-                                                       for (x2=xstart; x2<xstart+sd['colspan']; x2++)\r
-                                                               grid[y2][x2] = td;\r
+                                                       // Remove bogus nodes if there is children in the target cell\r
+                                                       if (children.length) {\r
+                                                               children = tinymce.grep(startCell.childNodes);\r
+                                                               count = 0;\r
+                                                               each(children, function(node) {\r
+                                                                       if (node.nodeName == 'BR' && dom.getAttrib(node, 'data-mce-bogus') && count++ < children.length - 1)\r
+                                                                               startCell.removeChild(node);\r
+                                                               });\r
+                                                       }\r
+                                                       \r
+                                                       // Remove cell\r
+                                                       dom.remove(cell);\r
                                                }\r
                                        }\r
                                }\r
 \r
-                               return grid;\r
+                               // Remove empty rows etc and restore caret location\r
+                               cleanup();\r
                        }\r
+               };\r
+\r
+               function insertRow(before) {\r
+                       var posY, cell, lastCell, x, rowElm, newRow, newCell, otherCell, rowSpan;\r
+\r
+                       // Find first/last row\r
+                       each(grid, function(row, y) {\r
+                               each(row, function(cell, x) {\r
+                                       if (isCellSelected(cell)) {\r
+                                               cell = cell.elm;\r
+                                               rowElm = cell.parentNode;\r
+                                               newRow = cloneNode(rowElm, false);\r
+                                               posY = y;\r
+\r
+                                               if (before)\r
+                                                       return false;\r
+                                       }\r
+                               });\r
 \r
-                       function trimRow(table, tr, td, new_tr) {\r
-                               var grid = getTableGrid(table), cpos = getCellPos(grid, td);\r
-                               var cells, lastElm;\r
-\r
-                               // Time to crop away some\r
-                               if (new_tr.cells.length != tr.childNodes.length) {\r
-                                       cells = tr.childNodes;\r
-                                       lastElm = null;\r
-\r
-                                       for (var x=0; td = getCell(grid, cpos.rowindex, x); x++) {\r
-                                               var remove = true;\r
-                                               var sd = getColRowSpan(td);\r
-\r
-                                               // Remove due to rowspan\r
-                                               if (inArray(cells, td)) {\r
-                                                       new_tr.childNodes[x]._delete = true;\r
-                                               } else if ((lastElm == null || td != lastElm) && sd.colspan > 1) { // Remove due to colspan\r
-                                                       for (var i=x; i<x+td.colSpan; i++)\r
-                                                               new_tr.childNodes[i]._delete = true;\r
-                                               }\r
+                               if (before)\r
+                                       return !posY;\r
+                       });\r
 \r
-                                               if ((lastElm == null || td != lastElm) && sd.rowspan > 1)\r
-                                                       td.rowSpan = sd.rowspan + 1;\r
+                       for (x = 0; x < grid[0].length; x++) {\r
+                               // Cell not found could be because of an invalid table structure\r
+                               if (!grid[posY][x])\r
+                                       continue;\r
 \r
-                                               lastElm = td;\r
+                               cell = grid[posY][x].elm;\r
+\r
+                               if (cell != lastCell) {\r
+                                       if (!before) {\r
+                                               rowSpan = getSpanVal(cell, 'rowspan');\r
+                                               if (rowSpan > 1) {\r
+                                                       setSpanVal(cell, 'rowSpan', rowSpan + 1);\r
+                                                       continue;\r
+                                               }\r
+                                       } else {\r
+                                               // Check if cell above can be expanded\r
+                                               if (posY > 0 && grid[posY - 1][x]) {\r
+                                                       otherCell = grid[posY - 1][x].elm;\r
+                                                       rowSpan = getSpanVal(otherCell, 'rowSpan');\r
+                                                       if (rowSpan > 1) {\r
+                                                               setSpanVal(otherCell, 'rowSpan', rowSpan + 1);\r
+                                                               continue;\r
+                                                       }\r
+                                               }\r
                                        }\r
 \r
-                                       deleteMarked(tableElm);\r
-                               }\r
-                       }\r
+                                       // Insert new cell into new row\r
+                                       newCell = cloneCell(cell);\r
+                                       setSpanVal(newCell, 'colSpan', cell.colSpan);\r
 \r
-                       function prevElm(node, name) {\r
-                               while ((node = node.previousSibling) != null) {\r
-                                       if (node.nodeName == name)\r
-                                               return node;\r
+                                       newRow.appendChild(newCell);\r
+\r
+                                       lastCell = cell;\r
                                }\r
+                       }\r
 \r
-                               return null;\r
+                       if (newRow.hasChildNodes()) {\r
+                               if (!before)\r
+                                       dom.insertAfter(newRow, rowElm);\r
+                               else\r
+                                       rowElm.parentNode.insertBefore(newRow, rowElm);\r
                        }\r
+               };\r
+\r
+               function insertCol(before) {\r
+                       var posX, lastCell;\r
 \r
-                       function nextElm(node, names) {\r
-                               var namesAr = names.split(',');\r
+                       // Find first/last column\r
+                       each(grid, function(row, y) {\r
+                               each(row, function(cell, x) {\r
+                                       if (isCellSelected(cell)) {\r
+                                               posX = x;\r
 \r
-                               while ((node = node.nextSibling) != null) {\r
-                                       for (var i=0; i<namesAr.length; i++) {\r
-                                               if (node.nodeName.toLowerCase() == namesAr[i].toLowerCase() )\r
-                                                       return node;\r
+                                               if (before)\r
+                                                       return false;\r
                                        }\r
-                               }\r
+                               });\r
 \r
-                               return null;\r
-                       }\r
+                               if (before)\r
+                                       return !posX;\r
+                       });\r
+\r
+                       each(grid, function(row, y) {\r
+                               var cell, rowSpan, colSpan;\r
 \r
-                       function deleteMarked(tbl) {\r
-                               if (tbl.rows == 0)\r
+                               if (!row[posX])\r
                                        return;\r
 \r
-                               var tr = tbl.rows[0];\r
-                               do {\r
-                                       var next = nextElm(tr, "TR");\r
+                               cell = row[posX].elm;\r
+                               if (cell != lastCell) {\r
+                                       colSpan = getSpanVal(cell, 'colspan');\r
+                                       rowSpan = getSpanVal(cell, 'rowspan');\r
+\r
+                                       if (colSpan == 1) {\r
+                                               if (!before) {\r
+                                                       dom.insertAfter(cloneCell(cell), cell);\r
+                                                       fillLeftDown(posX, y, rowSpan - 1, colSpan);\r
+                                               } else {\r
+                                                       cell.parentNode.insertBefore(cloneCell(cell), cell);\r
+                                                       fillLeftDown(posX, y, rowSpan - 1, colSpan);\r
+                                               }\r
+                                       } else\r
+                                               setSpanVal(cell, 'colSpan', cell.colSpan + 1);\r
 \r
-                                       // Delete row\r
-                                       if (tr._delete) {\r
-                                               tr.parentNode.removeChild(tr);\r
-                                               continue;\r
-                                       }\r
+                                       lastCell = cell;\r
+                               }\r
+                       });\r
+               };\r
 \r
-                                       // Delete cells\r
-                                       var td = tr.cells[0];\r
-                                       if (td.cells > 1) {\r
-                                               do {\r
-                                                       var nexttd = nextElm(td, "TD,TH");\r
+               function deleteCols() {\r
+                       var cols = [];\r
 \r
-                                                       if (td._delete)\r
-                                                               td.parentNode.removeChild(td);\r
-                                               } while ((td = nexttd) != null);\r
+                       // Get selected column indexes\r
+                       each(grid, function(row, y) {\r
+                               each(row, function(cell, x) {\r
+                                       if (isCellSelected(cell) && tinymce.inArray(cols, x) === -1) {\r
+                                               each(grid, function(row) {\r
+                                                       var cell = row[x].elm, colSpan;\r
+\r
+                                                       colSpan = getSpanVal(cell, 'colSpan');\r
+\r
+                                                       if (colSpan > 1)\r
+                                                               setSpanVal(cell, 'colSpan', colSpan - 1);\r
+                                                       else\r
+                                                               dom.remove(cell);\r
+                                               });\r
+\r
+                                               cols.push(x);\r
                                        }\r
-                               } while ((tr = next) != null);\r
-                       }\r
+                               });\r
+                       });\r
 \r
-                       function addRows(td_elm, tr_elm, rowspan) {\r
-                               // Add rows\r
-                               td_elm.rowSpan = 1;\r
-                               var trNext = nextElm(tr_elm, "TR");\r
-                               for (var i=1; i<rowspan && trNext; i++) {\r
-                                       var newTD = doc.createElement("td");\r
+                       cleanup();\r
+               };\r
 \r
-                                       if (!tinymce.isIE)\r
-                                               newTD.innerHTML = '<br mce_bogus="1"/>';\r
+               function deleteRows() {\r
+                       var rows;\r
 \r
-                                       if (tinymce.isIE)\r
-                                               trNext.insertBefore(newTD, trNext.cells(td_elm.cellIndex));\r
-                                       else\r
-                                               trNext.insertBefore(newTD, trNext.cells[td_elm.cellIndex]);\r
+                       function deleteRow(tr) {\r
+                               var nextTr, pos, lastCell;\r
 \r
-                                       trNext = nextElm(trNext, "TR");\r
-                               }\r
-                       }\r
+                               nextTr = dom.getNext(tr, 'tr');\r
 \r
-                       function copyRow(doc, table, tr) {\r
-                               var grid = getTableGrid(table);\r
-                               var newTR = tr.cloneNode(false);\r
-                               var cpos = getCellPos(grid, tr.cells[0]);\r
-                               var lastCell = null;\r
-                               var tableBorder = inst.dom.getAttrib(table, "border");\r
-                               var tdElm = null;\r
-\r
-                               for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {\r
-                                       var newTD = null;\r
-\r
-                                       if (lastCell != tdElm) {\r
-                                               for (var i=0; i<tr.cells.length; i++) {\r
-                                                       if (tdElm == tr.cells[i]) {\r
-                                                               newTD = tdElm.cloneNode(true);\r
-                                                               break;\r
-                                                       }\r
-                                               }\r
+                               // Move down row spanned cells\r
+                               each(tr.cells, function(cell) {\r
+                                       var rowSpan = getSpanVal(cell, 'rowSpan');\r
+\r
+                                       if (rowSpan > 1) {\r
+                                               setSpanVal(cell, 'rowSpan', rowSpan - 1);\r
+                                               pos = getPos(cell);\r
+                                               fillLeftDown(pos.x, pos.y, 1, 1);\r
                                        }\r
+                               });\r
+\r
+                               // Delete cells\r
+                               pos = getPos(tr.cells[0]);\r
+                               each(grid[pos.y], function(cell) {\r
+                                       var rowSpan;\r
+\r
+                                       cell = cell.elm;\r
 \r
-                                       if (newTD == null) {\r
-                                               newTD = doc.createElement("td");\r
+                                       if (cell != lastCell) {\r
+                                               rowSpan = getSpanVal(cell, 'rowSpan');\r
 \r
-                                               if (!tinymce.isIE)\r
-                                                       newTD.innerHTML = '<br mce_bogus="1"/>';\r
+                                               if (rowSpan <= 1)\r
+                                                       dom.remove(cell);\r
+                                               else\r
+                                                       setSpanVal(cell, 'rowSpan', rowSpan - 1);\r
+\r
+                                               lastCell = cell;\r
                                        }\r
+                               });\r
+                       };\r
 \r
-                                       // Reset col/row span\r
-                                       newTD.colSpan = 1;\r
-                                       newTD.rowSpan = 1;\r
+                       // Get selected rows and move selection out of scope\r
+                       rows = getSelectedRows();\r
 \r
-                                       newTR.appendChild(newTD);\r
+                       // Delete all selected rows\r
+                       each(rows.reverse(), function(tr) {\r
+                               deleteRow(tr);\r
+                       });\r
 \r
-                                       lastCell = tdElm;\r
-                               }\r
+                       cleanup();\r
+               };\r
 \r
-                               return newTR;\r
-                       }\r
+               function cutRows() {\r
+                       var rows = getSelectedRows();\r
 \r
-                       // ---- Commands -----\r
+                       dom.remove(rows);\r
+                       cleanup();\r
 \r
-                       // Handle commands\r
-                       switch (command) {\r
-                               case "mceTableMoveToNextRow":\r
-                                       var nextCell = getNextCell(tableElm, tdElm);\r
+                       return rows;\r
+               };\r
 \r
-                                       if (!nextCell) {\r
-                                               inst.execCommand("mceTableInsertRowAfter", tdElm);\r
-                                               nextCell = getNextCell(tableElm, tdElm);\r
-                                       }\r
+               function copyRows() {\r
+                       var rows = getSelectedRows();\r
 \r
-                                       inst.selection.select(nextCell);\r
-                                       inst.selection.collapse(true);\r
+                       each(rows, function(row, i) {\r
+                               rows[i] = cloneNode(row, true);\r
+                       });\r
 \r
-                                       return true;\r
+                       return rows;\r
+               };\r
 \r
-                               case "mceTableRowProps":\r
-                                       if (trElm == null)\r
-                                               return true;\r
+               function pasteRows(rows, before) {\r
+                       var selectedRows = getSelectedRows(),\r
+                               targetRow = selectedRows[before ? 0 : selectedRows.length - 1],\r
+                               targetCellCount = targetRow.cells.length;\r
 \r
-                                       if (user_interface) {\r
-                                               inst.windowManager.open({\r
-                                                       url : url + '/row.htm',\r
-                                                       width : 400 + parseInt(inst.getLang('table.rowprops_delta_width', 0)),\r
-                                                       height : 295 + parseInt(inst.getLang('table.rowprops_delta_height', 0)),\r
-                                                       inline : 1\r
-                                               }, {\r
-                                                       plugin_url : url\r
-                                               });\r
-                                       }\r
+                       // Calc target cell count\r
+                       each(grid, function(row) {\r
+                               var match;\r
 \r
-                                       return true;\r
+                               targetCellCount = 0;\r
+                               each(row, function(cell, x) {\r
+                                       if (cell.real)\r
+                                               targetCellCount += cell.colspan;\r
 \r
-                               case "mceTableCellProps":\r
-                                       if (tdElm == null)\r
-                                               return true;\r
+                                       if (cell.elm.parentNode == targetRow)\r
+                                               match = 1;\r
+                               });\r
 \r
-                                       if (user_interface) {\r
-                                               inst.windowManager.open({\r
-                                                       url : url + '/cell.htm',\r
-                                                       width : 400 + parseInt(inst.getLang('table.cellprops_delta_width', 0)),\r
-                                                       height : 295 + parseInt(inst.getLang('table.cellprops_delta_height', 0)),\r
-                                                       inline : 1\r
-                                               }, {\r
-                                                       plugin_url : url\r
-                                               });\r
-                                       }\r
+                               if (match)\r
+                                       return false;\r
+                       });\r
 \r
-                                       return true;\r
+                       if (!before)\r
+                               rows.reverse();\r
 \r
-                               case "mceInsertTable":\r
-                                       if (user_interface) {\r
-                                               inst.windowManager.open({\r
-                                                       url : url + '/table.htm',\r
-                                                       width : 400 + parseInt(inst.getLang('table.table_delta_width', 0)),\r
-                                                       height : 320 + parseInt(inst.getLang('table.table_delta_height', 0)),\r
-                                                       inline : 1\r
-                                               }, {\r
-                                                       plugin_url : url,\r
-                                                       action : value ? value.action : 0\r
-                                               });\r
-                                       }\r
+                       each(rows, function(row) {\r
+                               var cellCount = row.cells.length, cell;\r
+\r
+                               // Remove col/rowspans\r
+                               for (i = 0; i < cellCount; i++) {\r
+                                       cell = row.cells[i];\r
+                                       setSpanVal(cell, 'colSpan', 1);\r
+                                       setSpanVal(cell, 'rowSpan', 1);\r
+                               }\r
 \r
-                                       return true;\r
+                               // Needs more cells\r
+                               for (i = cellCount; i < targetCellCount; i++)\r
+                                       row.appendChild(cloneCell(row.cells[cellCount - 1]));\r
 \r
-                               case "mceTableDelete":\r
-                                       var table = inst.dom.getParent(inst.selection.getNode(), "table");\r
-                                       if (table) {\r
-                                               table.parentNode.removeChild(table);\r
-                                               inst.execCommand('mceRepaint');\r
+                               // Needs less cells\r
+                               for (i = targetCellCount; i < cellCount; i++)\r
+                                       dom.remove(row.cells[i]);\r
+\r
+                               // Add before/after\r
+                               if (before)\r
+                                       targetRow.parentNode.insertBefore(row, targetRow);\r
+                               else\r
+                                       dom.insertAfter(row, targetRow);\r
+                       });\r
+               };\r
+\r
+               function getPos(target) {\r
+                       var pos;\r
+\r
+                       each(grid, function(row, y) {\r
+                               each(row, function(cell, x) {\r
+                                       if (cell.elm == target) {\r
+                                               pos = {x : x, y : y};\r
+                                               return false;\r
                                        }\r
-                                       return true;\r
-\r
-                               case "mceTableSplitCells":\r
-                               case "mceTableMergeCells":\r
-                               case "mceTableInsertRowBefore":\r
-                               case "mceTableInsertRowAfter":\r
-                               case "mceTableDeleteRow":\r
-                               case "mceTableInsertColBefore":\r
-                               case "mceTableInsertColAfter":\r
-                               case "mceTableDeleteCol":\r
-                               case "mceTableCutRow":\r
-                               case "mceTableCopyRow":\r
-                               case "mceTablePasteRowBefore":\r
-                               case "mceTablePasteRowAfter":\r
-                                       // No table just return (invalid command)\r
-                                       if (!tableElm)\r
-                                               return true;\r
-\r
-                                       // Table has a tbody use that reference\r
-                                       // Changed logic by ApTest 2005.07.12 (www.aptest.com)\r
-                                       // Now lookk at the focused element and take its parentNode.  That will be a tbody or a table.\r
-                                       if (trElm && tableElm != trElm.parentNode)\r
-                                               tableElm = trElm.parentNode;\r
-\r
-                                       if (tableElm && trElm) {\r
-                                               switch (command) {\r
-                                                       case "mceTableCutRow":\r
-                                                               if (!trElm || !tdElm)\r
-                                                                       return true;\r
-\r
-                                                               inst.tableRowClipboard = copyRow(doc, tableElm, trElm);\r
-                                                               inst.execCommand("mceTableDeleteRow");\r
-                                                               break;\r
-\r
-                                                       case "mceTableCopyRow":\r
-                                                               if (!trElm || !tdElm)\r
-                                                                       return true;\r
-\r
-                                                               inst.tableRowClipboard = copyRow(doc, tableElm, trElm);\r
-                                                               break;\r
-\r
-                                                       case "mceTablePasteRowBefore":\r
-                                                               if (!trElm || !tdElm)\r
-                                                                       return true;\r
-\r
-                                                               var newTR = inst.tableRowClipboard.cloneNode(true);\r
-\r
-                                                               var prevTR = prevElm(trElm, "TR");\r
-                                                               if (prevTR != null)\r
-                                                                       trimRow(tableElm, prevTR, prevTR.cells[0], newTR);\r
-\r
-                                                               trElm.parentNode.insertBefore(newTR, trElm);\r
-                                                               break;\r
-\r
-                                                       case "mceTablePasteRowAfter":\r
-                                                               if (!trElm || !tdElm)\r
-                                                                       return true;\r
-                                                               \r
-                                                               var nextTR = nextElm(trElm, "TR");\r
-                                                               var newTR = inst.tableRowClipboard.cloneNode(true);\r
-\r
-                                                               trimRow(tableElm, trElm, tdElm, newTR);\r
-\r
-                                                               if (nextTR == null)\r
-                                                                       trElm.parentNode.appendChild(newTR);\r
-                                                               else\r
-                                                                       nextTR.parentNode.insertBefore(newTR, nextTR);\r
-\r
-                                                               break;\r
-\r
-                                                       case "mceTableInsertRowBefore":\r
-                                                               if (!trElm || !tdElm)\r
-                                                                       return true;\r
-\r
-                                                               var grid = getTableGrid(tableElm);\r
-                                                               var cpos = getCellPos(grid, tdElm);\r
-                                                               var newTR = doc.createElement("tr");\r
-                                                               var lastTDElm = null;\r
-\r
-                                                               cpos.rowindex--;\r
-                                                               if (cpos.rowindex < 0)\r
-                                                                       cpos.rowindex = 0;\r
-\r
-                                                               // Create cells\r
-                                                               for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {\r
-                                                                       if (tdElm != lastTDElm) {\r
-                                                                               var sd = getColRowSpan(tdElm);\r
-\r
-                                                                               if (sd['rowspan'] == 1) {\r
-                                                                                       var newTD = doc.createElement("td");\r
-\r
-                                                                                       if (!tinymce.isIE)\r
-                                                                                               newTD.innerHTML = '<br mce_bogus="1"/>';\r
-\r
-                                                                                       newTD.colSpan = tdElm.colSpan;\r
-\r
-                                                                                       newTR.appendChild(newTD);\r
-                                                                               } else\r
-                                                                                       tdElm.rowSpan = sd['rowspan'] + 1;\r
-\r
-                                                                               lastTDElm = tdElm;\r
-                                                                       }\r
-                                                               }\r
+                               });\r
 \r
-                                                               trElm.parentNode.insertBefore(newTR, trElm);\r
-                                                               select(0, 1);\r
-                                                       break;\r
+                               return !pos;\r
+                       });\r
 \r
-                                                       case "mceTableInsertRowAfter":\r
-                                                               if (!trElm || !tdElm)\r
-                                                                       return true;\r
+                       return pos;\r
+               };\r
 \r
-                                                               var grid = getTableGrid(tableElm);\r
-                                                               var cpos = getCellPos(grid, tdElm);\r
-                                                               var newTR = doc.createElement("tr");\r
-                                                               var lastTDElm = null;\r
+               function setStartCell(cell) {\r
+                       startPos = getPos(cell);\r
+               };\r
 \r
-                                                               // Create cells\r
-                                                               for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {\r
-                                                                       if (tdElm != lastTDElm) {\r
-                                                                               var sd = getColRowSpan(tdElm);\r
+               function findEndPos() {\r
+                       var pos, maxX, maxY;\r
 \r
-                                                                               if (sd['rowspan'] == 1) {\r
-                                                                                       var newTD = doc.createElement("td");\r
+                       maxX = maxY = 0;\r
 \r
-                                                                                       if (!tinymce.isIE)\r
-                                                                                               newTD.innerHTML = '<br mce_bogus="1"/>';\r
+                       each(grid, function(row, y) {\r
+                               each(row, function(cell, x) {\r
+                                       var colSpan, rowSpan;\r
 \r
-                                                                                       newTD.colSpan = tdElm.colSpan;\r
+                                       if (isCellSelected(cell)) {\r
+                                               cell = grid[y][x];\r
 \r
-                                                                                       newTR.appendChild(newTD);\r
-                                                                               } else\r
-                                                                                       tdElm.rowSpan = sd['rowspan'] + 1;\r
+                                               if (x > maxX)\r
+                                                       maxX = x;\r
 \r
-                                                                               lastTDElm = tdElm;\r
-                                                                       }\r
-                                                               }\r
+                                               if (y > maxY)\r
+                                                       maxY = y;\r
 \r
-                                                               if (newTR.hasChildNodes()) {\r
-                                                                       var nextTR = nextElm(trElm, "TR");\r
-                                                                       if (nextTR)\r
-                                                                               nextTR.parentNode.insertBefore(newTR, nextTR);\r
-                                                                       else\r
-                                                                               tableElm.appendChild(newTR);\r
-                                                               }\r
+                                               if (cell.real) {\r
+                                                       colSpan = cell.colspan - 1;\r
+                                                       rowSpan = cell.rowspan - 1;\r
 \r
-                                                               select(0, 1);\r
-                                                       break;\r
+                                                       if (colSpan) {\r
+                                                               if (x + colSpan > maxX)\r
+                                                                       maxX = x + colSpan;\r
+                                                       }\r
 \r
-                                                       case "mceTableDeleteRow":\r
-                                                               if (!trElm || !tdElm)\r
-                                                                       return true;\r
+                                                       if (rowSpan) {\r
+                                                               if (y + rowSpan > maxY)\r
+                                                                       maxY = y + rowSpan;\r
+                                                       }\r
+                                               }\r
+                                       }\r
+                               });\r
+                       });\r
 \r
-                                                               var grid = getTableGrid(tableElm);\r
-                                                               var cpos = getCellPos(grid, tdElm);\r
+                       return {x : maxX, y : maxY};\r
+               };\r
 \r
-                                                               // Only one row, remove whole table\r
-                                                               if (grid.length == 1 && tableElm.nodeName == 'TBODY') {\r
-                                                                       inst.dom.remove(inst.dom.getParent(tableElm, "table"));\r
-                                                                       return true;\r
-                                                               }\r
+               function setEndCell(cell) {\r
+                       var startX, startY, endX, endY, maxX, maxY, colSpan, rowSpan;\r
 \r
-                                                               // Move down row spanned cells\r
-                                                               var cells = trElm.cells;\r
-                                                               var nextTR = nextElm(trElm, "TR");\r
-                                                               for (var x=0; x<cells.length; x++) {\r
-                                                                       if (cells[x].rowSpan > 1) {\r
-                                                                               var newTD = cells[x].cloneNode(true);\r
-                                                                               var sd = getColRowSpan(cells[x]);\r
+                       endPos = getPos(cell);\r
 \r
-                                                                               newTD.rowSpan = sd.rowspan - 1;\r
+                       if (startPos && endPos) {\r
+                               // Get start/end positions\r
+                               startX = Math.min(startPos.x, endPos.x);\r
+                               startY = Math.min(startPos.y, endPos.y);\r
+                               endX = Math.max(startPos.x, endPos.x);\r
+                               endY = Math.max(startPos.y, endPos.y);\r
 \r
-                                                                               var nextTD = nextTR.cells[x];\r
+                               // Expand end positon to include spans\r
+                               maxX = endX;\r
+                               maxY = endY;\r
 \r
-                                                                               if (nextTD == null)\r
-                                                                                       nextTR.appendChild(newTD);\r
-                                                                               else\r
-                                                                                       nextTR.insertBefore(newTD, nextTD);\r
-                                                                       }\r
-                                                               }\r
+                               // Expand startX\r
+                               for (y = startY; y <= maxY; y++) {\r
+                                       cell = grid[y][startX];\r
 \r
-                                                               // Delete cells\r
-                                                               var lastTDElm = null;\r
-                                                               for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {\r
-                                                                       if (tdElm != lastTDElm) {\r
-                                                                               var sd = getColRowSpan(tdElm);\r
+                                       if (!cell.real) {\r
+                                               if (startX - (cell.colspan - 1) < startX)\r
+                                                       startX -= cell.colspan - 1;\r
+                                       }\r
+                               }\r
 \r
-                                                                               if (sd.rowspan > 1) {\r
-                                                                                       tdElm.rowSpan = sd.rowspan - 1;\r
-                                                                               } else {\r
-                                                                                       trElm = tdElm.parentNode;\r
+                               // Expand startY\r
+                               for (x = startX; x <= maxX; x++) {\r
+                                       cell = grid[startY][x];\r
 \r
-                                                                                       if (trElm.parentNode)\r
-                                                                                               trElm._delete = true;\r
-                                                                               }\r
+                                       if (!cell.real) {\r
+                                               if (startY - (cell.rowspan - 1) < startY)\r
+                                                       startY -= cell.rowspan - 1;\r
+                                       }\r
+                               }\r
 \r
-                                                                               lastTDElm = tdElm;\r
-                                                                       }\r
-                                                               }\r
+                               // Find max X, Y\r
+                               for (y = startY; y <= endY; y++) {\r
+                                       for (x = startX; x <= endX; x++) {\r
+                                               cell = grid[y][x];\r
 \r
-                                                               deleteMarked(tableElm);\r
+                                               if (cell.real) {\r
+                                                       colSpan = cell.colspan - 1;\r
+                                                       rowSpan = cell.rowspan - 1;\r
 \r
-                                                               select(0, -1);\r
-                                                       break;\r
+                                                       if (colSpan) {\r
+                                                               if (x + colSpan > maxX)\r
+                                                                       maxX = x + colSpan;\r
+                                                       }\r
 \r
-                                                       case "mceTableInsertColBefore":\r
-                                                               if (!trElm || !tdElm)\r
-                                                                       return true;\r
+                                                       if (rowSpan) {\r
+                                                               if (y + rowSpan > maxY)\r
+                                                                       maxY = y + rowSpan;\r
+                                                       }\r
+                                               }\r
+                                       }\r
+                               }\r
 \r
-                                                               var grid = getTableGrid(inst.dom.getParent(tableElm, "table"));\r
-                                                               var cpos = getCellPos(grid, tdElm);\r
-                                                               var lastTDElm = null;\r
+                               // Remove current selection\r
+                               dom.removeClass(dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');\r
 \r
-                                                               for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {\r
-                                                                       if (tdElm != lastTDElm) {\r
-                                                                               var sd = getColRowSpan(tdElm);\r
+                               // Add new selection\r
+                               for (y = startY; y <= maxY; y++) {\r
+                                       for (x = startX; x <= maxX; x++) {\r
+                                               if (grid[y][x])\r
+                                                       dom.addClass(grid[y][x].elm, 'mceSelected');\r
+                                       }\r
+                               }\r
+                       }\r
+               };\r
+\r
+               // Expose to public\r
+               tinymce.extend(this, {\r
+                       deleteTable : deleteTable,\r
+                       split : split,\r
+                       merge : merge,\r
+                       insertRow : insertRow,\r
+                       insertCol : insertCol,\r
+                       deleteCols : deleteCols,\r
+                       deleteRows : deleteRows,\r
+                       cutRows : cutRows,\r
+                       copyRows : copyRows,\r
+                       pasteRows : pasteRows,\r
+                       getPos : getPos,\r
+                       setStartCell : setStartCell,\r
+                       setEndCell : setEndCell\r
+               });\r
+       };\r
 \r
-                                                                               if (sd['colspan'] == 1) {\r
-                                                                                       var newTD = doc.createElement(tdElm.nodeName);\r
+       tinymce.create('tinymce.plugins.TablePlugin', {\r
+               init : function(ed, url) {\r
+                       var winMan, clipboardRows;\r
 \r
-                                                                                       if (!tinymce.isIE)\r
-                                                                                               newTD.innerHTML = '<br mce_bogus="1"/>';\r
+                       function createTableGrid(node) {\r
+                               var selection = ed.selection, tblElm = ed.dom.getParent(node || selection.getNode(), 'table');\r
 \r
-                                                                                       newTD.rowSpan = tdElm.rowSpan;\r
+                               if (tblElm)\r
+                                       return new TableGrid(tblElm, ed.dom, selection);\r
+                       };\r
 \r
-                                                                                       tdElm.parentNode.insertBefore(newTD, tdElm);\r
-                                                                               } else\r
-                                                                                       tdElm.colSpan++;\r
+                       function cleanup() {\r
+                               // Restore selection possibilities\r
+                               ed.getBody().style.webkitUserSelect = '';\r
+                               ed.dom.removeClass(ed.dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');\r
+                       };\r
 \r
-                                                                               lastTDElm = tdElm;\r
-                                                                       }\r
-                                                               }\r
+                       // Register buttons\r
+                       each([\r
+                               ['table', 'table.desc', 'mceInsertTable', true],\r
+                               ['delete_table', 'table.del', 'mceTableDelete'],\r
+                               ['delete_col', 'table.delete_col_desc', 'mceTableDeleteCol'],\r
+                               ['delete_row', 'table.delete_row_desc', 'mceTableDeleteRow'],\r
+                               ['col_after', 'table.col_after_desc', 'mceTableInsertColAfter'],\r
+                               ['col_before', 'table.col_before_desc', 'mceTableInsertColBefore'],\r
+                               ['row_after', 'table.row_after_desc', 'mceTableInsertRowAfter'],\r
+                               ['row_before', 'table.row_before_desc', 'mceTableInsertRowBefore'],\r
+                               ['row_props', 'table.row_desc', 'mceTableRowProps', true],\r
+                               ['cell_props', 'table.cell_desc', 'mceTableCellProps', true],\r
+                               ['split_cells', 'table.split_cells_desc', 'mceTableSplitCells', true],\r
+                               ['merge_cells', 'table.merge_cells_desc', 'mceTableMergeCells', true]\r
+                       ], function(c) {\r
+                               ed.addButton(c[0], {title : c[1], cmd : c[2], ui : c[3]});\r
+                       });\r
 \r
-                                                               select();\r
-                                                       break;\r
+                       // Select whole table is a table border is clicked\r
+                       if (!tinymce.isIE) {\r
+                               ed.onClick.add(function(ed, e) {\r
+                                       e = e.target;\r
 \r
-                                                       case "mceTableInsertColAfter":\r
-                                                               if (!trElm || !tdElm)\r
-                                                                       return true;\r
+                                       if (e.nodeName === 'TABLE') {\r
+                                               ed.selection.select(e);\r
+                                               ed.nodeChanged();\r
+                                       }\r
+                               });\r
+                       }\r
 \r
-                                                               var grid = getTableGrid(inst.dom.getParent(tableElm, "table"));\r
-                                                               var cpos = getCellPos(grid, tdElm);\r
-                                                               var lastTDElm = null;\r
+                       ed.onPreProcess.add(function(ed, args) {\r
+                               var nodes, i, node, dom = ed.dom, value;\r
 \r
-                                                               for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {\r
-                                                                       if (tdElm != lastTDElm) {\r
-                                                                               var sd = getColRowSpan(tdElm);\r
+                               nodes = dom.select('table', args.node);\r
+                               i = nodes.length;\r
+                               while (i--) {\r
+                                       node = nodes[i];\r
+                                       dom.setAttrib(node, 'data-mce-style', '');\r
 \r
-                                                                               if (sd['colspan'] == 1) {\r
-                                                                                       var newTD = doc.createElement(tdElm.nodeName);\r
+                                       if ((value = dom.getAttrib(node, 'width'))) {\r
+                                               dom.setStyle(node, 'width', value);\r
+                                               dom.setAttrib(node, 'width', '');\r
+                                       }\r
 \r
-                                                                                       if (!tinymce.isIE)\r
-                                                                                               newTD.innerHTML = '<br mce_bogus="1"/>';\r
+                                       if ((value = dom.getAttrib(node, 'height'))) {\r
+                                               dom.setStyle(node, 'height', value);\r
+                                               dom.setAttrib(node, 'height', '');\r
+                                       }\r
+                               }\r
+                       });\r
 \r
-                                                                                       newTD.rowSpan = tdElm.rowSpan;\r
+                       // Handle node change updates\r
+                       ed.onNodeChange.add(function(ed, cm, n) {\r
+                               var p;\r
 \r
-                                                                                       var nextTD = nextElm(tdElm, "TD,TH");\r
-                                                                                       if (nextTD == null)\r
-                                                                                               tdElm.parentNode.appendChild(newTD);\r
-                                                                                       else\r
-                                                                                               nextTD.parentNode.insertBefore(newTD, nextTD);\r
-                                                                               } else\r
-                                                                                       tdElm.colSpan++;\r
+                               n = ed.selection.getStart();\r
+                               p = ed.dom.getParent(n, 'td,th,caption');\r
+                               cm.setActive('table', n.nodeName === 'TABLE' || !!p);\r
 \r
-                                                                               lastTDElm = tdElm;\r
-                                                                       }\r
-                                                               }\r
+                               // Disable table tools if we are in caption\r
+                               if (p && p.nodeName === 'CAPTION')\r
+                                       p = 0;\r
 \r
-                                                               select(1);\r
-                                                       break;\r
+                               cm.setDisabled('delete_table', !p);\r
+                               cm.setDisabled('delete_col', !p);\r
+                               cm.setDisabled('delete_table', !p);\r
+                               cm.setDisabled('delete_row', !p);\r
+                               cm.setDisabled('col_after', !p);\r
+                               cm.setDisabled('col_before', !p);\r
+                               cm.setDisabled('row_after', !p);\r
+                               cm.setDisabled('row_before', !p);\r
+                               cm.setDisabled('row_props', !p);\r
+                               cm.setDisabled('cell_props', !p);\r
+                               cm.setDisabled('split_cells', !p);\r
+                               cm.setDisabled('merge_cells', !p);\r
+                       });\r
 \r
-                                                       case "mceTableDeleteCol":\r
-                                                               if (!trElm || !tdElm)\r
-                                                                       return true;\r
+                       ed.onInit.add(function(ed) {\r
+                               var startTable, startCell, dom = ed.dom, tableGrid;\r
 \r
-                                                               var grid = getTableGrid(tableElm);\r
-                                                               var cpos = getCellPos(grid, tdElm);\r
-                                                               var lastTDElm = null;\r
+                               winMan = ed.windowManager;\r
 \r
-                                                               // Only one col, remove whole table\r
-                                                               if ((grid.length > 1 && grid[0].length <= 1) && tableElm.nodeName == 'TBODY') {\r
-                                                                       inst.dom.remove(inst.dom.getParent(tableElm, "table"));\r
-                                                                       return true;\r
-                                                               }\r
+                               // Add cell selection logic\r
+                               ed.onMouseDown.add(function(ed, e) {\r
+                                       if (e.button != 2) {\r
+                                               cleanup();\r
 \r
-                                                               // Delete cells\r
-                                                               for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {\r
-                                                                       if (tdElm != lastTDElm) {\r
-                                                                               var sd = getColRowSpan(tdElm);\r
+                                               startCell = dom.getParent(e.target, 'td,th');\r
+                                               startTable = dom.getParent(startCell, 'table');\r
+                                       }\r
+                               });\r
 \r
-                                                                               if (sd['colspan'] > 1)\r
-                                                                                       tdElm.colSpan = sd['colspan'] - 1;\r
-                                                                               else {\r
-                                                                                       if (tdElm.parentNode)\r
-                                                                                               tdElm.parentNode.removeChild(tdElm);\r
-                                                                               }\r
+                               dom.bind(ed.getDoc(), 'mouseover', function(e) {\r
+                                       var sel, table, target = e.target;\r
 \r
-                                                                               lastTDElm = tdElm;\r
-                                                                       }\r
-                                                               }\r
+                                       if (startCell && (tableGrid || target != startCell) && (target.nodeName == 'TD' || target.nodeName == 'TH')) {\r
+                                               table = dom.getParent(target, 'table');\r
+                                               if (table == startTable) {\r
+                                                       if (!tableGrid) {\r
+                                                               tableGrid = createTableGrid(table);\r
+                                                               tableGrid.setStartCell(startCell);\r
 \r
-                                                               select(-1);\r
-                                                       break;\r
+                                                               ed.getBody().style.webkitUserSelect = 'none';\r
+                                                       }\r
 \r
-                                               case "mceTableSplitCells":\r
-                                                       if (!trElm || !tdElm)\r
-                                                               return true;\r
+                                                       tableGrid.setEndCell(target);\r
+                                               }\r
 \r
-                                                       var spandata = getColRowSpan(tdElm);\r
+                                               // Remove current selection\r
+                                               sel = ed.selection.getSel();\r
 \r
-                                                       var colspan = spandata["colspan"];\r
-                                                       var rowspan = spandata["rowspan"];\r
+                                               try {\r
+                                                       if (sel.removeAllRanges)\r
+                                                               sel.removeAllRanges();\r
+                                                       else\r
+                                                               sel.empty();\r
+                                               } catch (ex) {\r
+                                                       // IE9 might throw errors here\r
+                                               }\r
 \r
-                                                       // Needs splitting\r
-                                                       if (colspan > 1 || rowspan > 1) {\r
-                                                               // Generate cols\r
-                                                               tdElm.colSpan = 1;\r
-                                                               for (var i=1; i<colspan; i++) {\r
-                                                                       var newTD = doc.createElement("td");\r
+                                               e.preventDefault();\r
+                                       }\r
+                               });\r
 \r
-                                                                       if (!tinymce.isIE)\r
-                                                                               newTD.innerHTML = '<br mce_bogus="1"/>';\r
+                               ed.onMouseUp.add(function(ed, e) {\r
+                                       var rng, sel = ed.selection, selectedCells, nativeSel = sel.getSel(), walker, node, lastNode, endNode;\r
 \r
-                                                                       trElm.insertBefore(newTD, nextElm(tdElm, "TD,TH"));\r
+                                       // Move selection to startCell\r
+                                       if (startCell) {\r
+                                               if (tableGrid)\r
+                                                       ed.getBody().style.webkitUserSelect = '';\r
 \r
-                                                                       if (rowspan > 1)\r
-                                                                               addRows(newTD, trElm, rowspan);\r
-                                                               }\r
+                                               function setPoint(node, start) {\r
+                                                       var walker = new tinymce.dom.TreeWalker(node, node);\r
 \r
-                                                               addRows(tdElm, trElm, rowspan);\r
-                                                       }\r
+                                                       do {\r
+                                                               // Text node\r
+                                                               if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {\r
+                                                                       if (start)\r
+                                                                               rng.setStart(node, 0);\r
+                                                                       else\r
+                                                                               rng.setEnd(node, node.nodeValue.length);\r
 \r
-                                                       // Apply visual aids\r
-                                                       tableElm = inst.dom.getParent(inst.selection.getNode(), "table");\r
-                                                       break;\r
+                                                                       return;\r
+                                                               }\r
 \r
-                                               case "mceTableMergeCells":\r
-                                                       var rows = [];\r
-                                                       var sel = inst.selection.getSel();\r
-                                                       var grid = getTableGrid(tableElm);\r
-\r
-                                                       if (tinymce.isIE || sel.rangeCount == 1) {\r
-                                                               if (user_interface) {\r
-                                                                       // Setup template\r
-                                                                       var sp = getColRowSpan(tdElm);\r
-\r
-                                                                       inst.windowManager.open({\r
-                                                                               url : url + '/merge_cells.htm',\r
-                                                                               width : 240 + parseInt(inst.getLang('table.merge_cells_delta_width', 0)),\r
-                                                                               height : 110 + parseInt(inst.getLang('table.merge_cells_delta_height', 0)),\r
-                                                                               inline : 1\r
-                                                                       }, {\r
-                                                                               action : "update",\r
-                                                                               numcols : sp.colspan,\r
-                                                                               numrows : sp.rowspan,\r
-                                                                               plugin_url : url\r
-                                                                       });\r
-\r
-                                                                       return true;\r
-                                                               } else {\r
-                                                                       var numRows = parseInt(value['numrows']);\r
-                                                                       var numCols = parseInt(value['numcols']);\r
-                                                                       var cpos = getCellPos(grid, tdElm);\r
-\r
-                                                                       if (("" + numRows) == "NaN")\r
-                                                                               numRows = 1;\r
-\r
-                                                                       if (("" + numCols) == "NaN")\r
-                                                                               numCols = 1;\r
-\r
-                                                                       // Get rows and cells\r
-                                                                       var tRows = tableElm.rows;\r
-                                                                       for (var y=cpos.rowindex; y<grid.length; y++) {\r
-                                                                               var rowCells = [];\r
-\r
-                                                                               for (var x=cpos.cellindex; x<grid[y].length; x++) {\r
-                                                                                       var td = getCell(grid, y, x);\r
-\r
-                                                                                       if (td && !inArray(rows, td) && !inArray(rowCells, td)) {\r
-                                                                                               var cp = getCellPos(grid, td);\r
-\r
-                                                                                               // Within range\r
-                                                                                               if (cp.cellindex < cpos.cellindex+numCols && cp.rowindex < cpos.rowindex+numRows)\r
-                                                                                                       rowCells[rowCells.length] = td;\r
-                                                                                       }\r
-                                                                               }\r
-\r
-                                                                               if (rowCells.length > 0)\r
-                                                                                       rows[rows.length] = rowCells;\r
-\r
-                                                                               var td = getCell(grid, cpos.rowindex, cpos.cellindex);\r
-                                                                               each(ed.dom.select('br', td), function(e, i) {\r
-                                                                                       if (i > 0 && ed.dom.getAttrib('mce_bogus'))\r
-                                                                                               ed.dom.remove(e);\r
-                                                                               });\r
-                                                                       }\r
+                                                               // BR element\r
+                                                               if (node.nodeName == 'BR') {\r
+                                                                       if (start)\r
+                                                                               rng.setStartBefore(node);\r
+                                                                       else\r
+                                                                               rng.setEndBefore(node);\r
 \r
-                                                                       //return true;\r
+                                                                       return;\r
                                                                }\r
-                                                       } else {\r
-                                                               var cells = [];\r
-                                                               var sel = inst.selection.getSel();\r
-                                                               var lastTR = null;\r
-                                                               var curRow = null;\r
-                                                               var x1 = -1, y1 = -1, x2, y2;\r
-\r
-                                                               // Only one cell selected, whats the point?\r
-                                                               if (sel.rangeCount < 2)\r
-                                                                       return true;\r
-\r
-                                                               // Get all selected cells\r
-                                                               for (var i=0; i<sel.rangeCount; i++) {\r
-                                                                       var rng = sel.getRangeAt(i);\r
-                                                                       var tdElm = rng.startContainer.childNodes[rng.startOffset];\r
-\r
-                                                                       if (!tdElm)\r
+                                                       } while (node = (start ? walker.next() : walker.prev()));\r
+                                               };\r
+\r
+                                               // Try to expand text selection as much as we can only Gecko supports cell selection\r
+                                               selectedCells = dom.select('td.mceSelected,th.mceSelected');\r
+                                               if (selectedCells.length > 0) {\r
+                                                       rng = dom.createRng();\r
+                                                       node = selectedCells[0];\r
+                                                       endNode = selectedCells[selectedCells.length - 1];\r
+\r
+                                                       setPoint(node, 1);\r
+                                                       walker = new tinymce.dom.TreeWalker(node, dom.getParent(selectedCells[0], 'table'));\r
+\r
+                                                       do {\r
+                                                               if (node.nodeName == 'TD' || node.nodeName == 'TH') {\r
+                                                                       if (!dom.hasClass(node, 'mceSelected'))\r
                                                                                break;\r
 \r
-                                                                       if (tdElm.nodeName == "TD" || tdElm.nodeName == "TH")\r
-                                                                               cells[cells.length] = tdElm;\r
+                                                                       lastNode = node;\r
                                                                }\r
+                                                       } while (node = walker.next());\r
 \r
-                                                               // Get rows and cells\r
-                                                               var tRows = tableElm.rows;\r
-                                                               for (var y=0; y<tRows.length; y++) {\r
-                                                                       var rowCells = [];\r
+                                                       setPoint(lastNode);\r
 \r
-                                                                       for (var x=0; x<tRows[y].cells.length; x++) {\r
-                                                                               var td = tRows[y].cells[x];\r
+                                                       sel.setRng(rng);\r
+                                               }\r
 \r
-                                                                               for (var i=0; i<cells.length; i++) {\r
-                                                                                       if (td == cells[i]) {\r
-                                                                                               rowCells[rowCells.length] = td;\r
-                                                                                       }\r
-                                                                               }\r
-                                                                       }\r
+                                               ed.nodeChanged();\r
+                                               startCell = tableGrid = startTable = null;\r
+                                       }\r
+                               });\r
 \r
-                                                                       if (rowCells.length > 0)\r
-                                                                               rows[rows.length] = rowCells;\r
-                                                               }\r
+                               ed.onKeyUp.add(function(ed, e) {\r
+                                       cleanup();\r
+                               });\r
 \r
-                                                               // Find selected cells in grid and box\r
-                                                               var curRow = [];\r
-                                                               var lastTR = null;\r
-                                                               for (var y=0; y<grid.length; y++) {\r
-                                                                       for (var x=0; x<grid[y].length; x++) {\r
-                                                                               grid[y][x]._selected = false;\r
-\r
-                                                                               for (var i=0; i<cells.length; i++) {\r
-                                                                                       if (grid[y][x] == cells[i]) {\r
-                                                                                               // Get start pos\r
-                                                                                               if (x1 == -1) {\r
-                                                                                                       x1 = x;\r
-                                                                                                       y1 = y;\r
-                                                                                               }\r
-\r
-                                                                                               // Get end pos\r
-                                                                                               x2 = x;\r
-                                                                                               y2 = y;\r
-\r
-                                                                                               grid[y][x]._selected = true;\r
-                                                                                       }\r
-                                                                               }\r
-                                                                       }\r
-                                                               }\r
+                               // Add context menu\r
+                               if (ed && ed.plugins.contextmenu) {\r
+                                       ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {\r
+                                               var sm, se = ed.selection, el = se.getNode() || ed.getBody();\r
 \r
-                                                               // Is there gaps, if so deny\r
-                                                               for (var y=y1; y<=y2; y++) {\r
-                                                                       for (var x=x1; x<=x2; x++) {\r
-                                                                               if (!grid[y][x]._selected) {\r
-                                                                                       alert("Invalid selection for merge.");\r
-                                                                                       return true;\r
-                                                                               }\r
-                                                                       }\r
-                                                               }\r
+                                               if (ed.dom.getParent(e, 'td') || ed.dom.getParent(e, 'th') || ed.dom.select('td.mceSelected,th.mceSelected').length) {\r
+                                                       m.removeAll();\r
+\r
+                                                       if (el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) {\r
+                                                               m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});\r
+                                                               m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});\r
+                                                               m.addSeparator();\r
                                                        }\r
 \r
-                                                       // Validate selection and get total rowspan and colspan\r
-                                                       var rowSpan = 1, colSpan = 1;\r
+                                                       if (el.nodeName == 'IMG' && el.className.indexOf('mceItem') == -1) {\r
+                                                               m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});\r
+                                                               m.addSeparator();\r
+                                                       }\r
 \r
-                                                       // Validate horizontal and get total colspan\r
-                                                       var lastRowSpan = -1;\r
-                                                       for (var y=0; y<rows.length; y++) {\r
-                                                               var rowColSpan = 0;\r
+                                                       m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', value : {action : 'insert'}});\r
+                                                       m.add({title : 'table.props_desc', icon : 'table_props', cmd : 'mceInsertTable'});\r
+                                                       m.add({title : 'table.del', icon : 'delete_table', cmd : 'mceTableDelete'});\r
+                                                       m.addSeparator();\r
 \r
-                                                               for (var x=0; x<rows[y].length; x++) {\r
-                                                                       var sd = getColRowSpan(rows[y][x]);\r
+                                                       // Cell menu\r
+                                                       sm = m.addMenu({title : 'table.cell'});\r
+                                                       sm.add({title : 'table.cell_desc', icon : 'cell_props', cmd : 'mceTableCellProps'});\r
+                                                       sm.add({title : 'table.split_cells_desc', icon : 'split_cells', cmd : 'mceTableSplitCells'});\r
+                                                       sm.add({title : 'table.merge_cells_desc', icon : 'merge_cells', cmd : 'mceTableMergeCells'});\r
 \r
-                                                                       rowColSpan += sd['colspan'];\r
+                                                       // Row menu\r
+                                                       sm = m.addMenu({title : 'table.row'});\r
+                                                       sm.add({title : 'table.row_desc', icon : 'row_props', cmd : 'mceTableRowProps'});\r
+                                                       sm.add({title : 'table.row_before_desc', icon : 'row_before', cmd : 'mceTableInsertRowBefore'});\r
+                                                       sm.add({title : 'table.row_after_desc', icon : 'row_after', cmd : 'mceTableInsertRowAfter'});\r
+                                                       sm.add({title : 'table.delete_row_desc', icon : 'delete_row', cmd : 'mceTableDeleteRow'});\r
+                                                       sm.addSeparator();\r
+                                                       sm.add({title : 'table.cut_row_desc', icon : 'cut', cmd : 'mceTableCutRow'});\r
+                                                       sm.add({title : 'table.copy_row_desc', icon : 'copy', cmd : 'mceTableCopyRow'});\r
+                                                       sm.add({title : 'table.paste_row_before_desc', icon : 'paste', cmd : 'mceTablePasteRowBefore'}).setDisabled(!clipboardRows);\r
+                                                       sm.add({title : 'table.paste_row_after_desc', icon : 'paste', cmd : 'mceTablePasteRowAfter'}).setDisabled(!clipboardRows);\r
 \r
-                                                                       if (lastRowSpan != -1 && sd['rowspan'] != lastRowSpan) {\r
-                                                                               alert("Invalid selection for merge.");\r
-                                                                               return true;\r
-                                                                       }\r
+                                                       // Column menu\r
+                                                       sm = m.addMenu({title : 'table.col'});\r
+                                                       sm.add({title : 'table.col_before_desc', icon : 'col_before', cmd : 'mceTableInsertColBefore'});\r
+                                                       sm.add({title : 'table.col_after_desc', icon : 'col_after', cmd : 'mceTableInsertColAfter'});\r
+                                                       sm.add({title : 'table.delete_col_desc', icon : 'delete_col', cmd : 'mceTableDeleteCol'});\r
+                                               } else\r
+                                                       m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable'});\r
+                                       });\r
+                               }\r
 \r
-                                                                       lastRowSpan = sd['rowspan'];\r
-                                                               }\r
+                               // Fixes an issue on Gecko where it's impossible to place the caret behind a table\r
+                               // This fix will force a paragraph element after the table but only when the forced_root_block setting is enabled\r
+                               if (!tinymce.isIE) {\r
+                                       function fixTableCaretPos() {\r
+                                               var last;\r
 \r
-                                                               if (rowColSpan > colSpan)\r
-                                                                       colSpan = rowColSpan;\r
+                                               // Skip empty text nodes form the end\r
+                                               for (last = ed.getBody().lastChild; last && last.nodeType == 3 && !last.nodeValue.length; last = last.previousSibling) ;\r
 \r
-                                                               lastRowSpan = -1;\r
-                                                       }\r
+                                               if (last && last.nodeName == 'TABLE')\r
+                                                       ed.dom.add(ed.getBody(), 'p', null, '<br mce_bogus="1" />');\r
+                                       };\r
 \r
-                                                       // Validate vertical and get total rowspan\r
-                                                       var lastColSpan = -1;\r
-                                                       for (var x=0; x<rows[0].length; x++) {\r
-                                                               var colRowSpan = 0;\r
+                                       // Fixes an bug where it's impossible to place the caret before a table in Gecko\r
+                                       // this fix solves it by detecting when the caret is at the beginning of such a table\r
+                                       // and then manually moves the caret infront of the table\r
+                                       if (tinymce.isGecko) {\r
+                                               ed.onKeyDown.add(function(ed, e) {\r
+                                                       var rng, table, dom = ed.dom;\r
 \r
-                                                               for (var y=0; y<rows.length; y++) {\r
-                                                                       var sd = getColRowSpan(rows[y][x]);\r
+                                                       // On gecko it's not possible to place the caret before a table\r
+                                                       if (e.keyCode == 37 || e.keyCode == 38) {\r
+                                                               rng = ed.selection.getRng();\r
+                                                               table = dom.getParent(rng.startContainer, 'table');\r
 \r
-                                                                       colRowSpan += sd['rowspan'];\r
+                                                               if (table && ed.getBody().firstChild == table) {\r
+                                                                       if (isAtStart(rng, table)) {\r
+                                                                               rng = dom.createRng();\r
 \r
-                                                                       if (lastColSpan != -1 && sd['colspan'] != lastColSpan) {\r
-                                                                               alert("Invalid selection for merge.");\r
-                                                                               return true;\r
-                                                                       }\r
+                                                                               rng.setStartBefore(table);\r
+                                                                               rng.setEndBefore(table);\r
+\r
+                                                                               ed.selection.setRng(rng);\r
 \r
-                                                                       lastColSpan = sd['colspan'];\r
+                                                                               e.preventDefault();\r
+                                                                       }\r
                                                                }\r
+                                                       }\r
+                                               });\r
+                                       }\r
 \r
-                                                               if (colRowSpan > rowSpan)\r
-                                                                       rowSpan = colRowSpan;\r
+                                       ed.onKeyUp.add(fixTableCaretPos);\r
+                                       ed.onSetContent.add(fixTableCaretPos);\r
+                                       ed.onVisualAid.add(fixTableCaretPos);\r
 \r
-                                                               lastColSpan = -1;\r
-                                                       }\r
+                                       ed.onPreProcess.add(function(ed, o) {\r
+                                               var last = o.node.lastChild;\r
 \r
-                                                       // Setup td\r
-                                                       tdElm = rows[0][0];\r
-                                                       tdElm.rowSpan = rowSpan;\r
-                                                       tdElm.colSpan = colSpan;\r
+                                               if (last && last.childNodes.length == 1 && last.firstChild.nodeName == 'BR')\r
+                                                       ed.dom.remove(last);\r
+                                       });\r
 \r
-                                                       // Merge cells\r
-                                                       for (var y=0; y<rows.length; y++) {\r
-                                                               for (var x=0; x<rows[y].length; x++) {\r
-                                                                       var html = rows[y][x].innerHTML;\r
-                                                                       var chk = html.replace(/[ \t\r\n]/g, "");\r
+                                       fixTableCaretPos();\r
+                               }\r
+                       });\r
 \r
-                                                                       if (chk != "<br/>" && chk != "<br>" && chk != '<br mce_bogus="1"/>' && (x+y > 0))\r
-                                                                               tdElm.innerHTML += html;\r
+                       // Register action commands\r
+                       each({\r
+                               mceTableSplitCells : function(grid) {\r
+                                       grid.split();\r
+                               },\r
 \r
-                                                                       // Not current cell\r
-                                                                       if (rows[y][x] != tdElm && !rows[y][x]._deleted) {\r
-                                                                               var cpos = getCellPos(grid, rows[y][x]);\r
-                                                                               var tr = rows[y][x].parentNode;\r
+                               mceTableMergeCells : function(grid) {\r
+                                       var rowSpan, colSpan, cell;\r
 \r
-                                                                               tr.removeChild(rows[y][x]);\r
-                                                                               rows[y][x]._deleted = true;\r
+                                       cell = ed.dom.getParent(ed.selection.getNode(), 'th,td');\r
+                                       if (cell) {\r
+                                               rowSpan = cell.rowSpan;\r
+                                               colSpan = cell.colSpan;\r
+                                       }\r
 \r
-                                                                               // Empty TR, remove it\r
-                                                                               if (!tr.hasChildNodes()) {\r
-                                                                                       tr.parentNode.removeChild(tr);\r
+                                       if (!ed.dom.select('td.mceSelected,th.mceSelected').length) {\r
+                                               winMan.open({\r
+                                                       url : url + '/merge_cells.htm',\r
+                                                       width : 240 + parseInt(ed.getLang('table.merge_cells_delta_width', 0)),\r
+                                                       height : 110 + parseInt(ed.getLang('table.merge_cells_delta_height', 0)),\r
+                                                       inline : 1\r
+                                               }, {\r
+                                                       rows : rowSpan,\r
+                                                       cols : colSpan,\r
+                                                       onaction : function(data) {\r
+                                                               grid.merge(cell, data.cols, data.rows);\r
+                                                       },\r
+                                                       plugin_url : url\r
+                                               });\r
+                                       } else\r
+                                               grid.merge();\r
+                               },\r
 \r
-                                                                                       var lastCell = null;\r
-                                                                                       for (var x=0; cellElm = getCell(grid, cpos.rowindex, x); x++) {\r
-                                                                                               if (cellElm != lastCell && cellElm.rowSpan > 1)\r
-                                                                                                       cellElm.rowSpan--;\r
+                               mceTableInsertRowBefore : function(grid) {\r
+                                       grid.insertRow(true);\r
+                               },\r
 \r
-                                                                                               lastCell = cellElm;\r
-                                                                                       }\r
+                               mceTableInsertRowAfter : function(grid) {\r
+                                       grid.insertRow();\r
+                               },\r
 \r
-                                                                                       if (tdElm.rowSpan > 1)\r
-                                                                                               tdElm.rowSpan--;\r
-                                                                               }\r
-                                                                       }\r
-                                                               }\r
-                                                       }\r
+                               mceTableInsertColBefore : function(grid) {\r
+                                       grid.insertCol(true);\r
+                               },\r
 \r
-                                                       // Remove all but one bogus br\r
-                                                       each(ed.dom.select('br', tdElm), function(e, i) {\r
-                                                               if (i > 0 && ed.dom.getAttrib(e, 'mce_bogus'))\r
-                                                                       ed.dom.remove(e);\r
-                                                       });\r
+                               mceTableInsertColAfter : function(grid) {\r
+                                       grid.insertCol();\r
+                               },\r
 \r
-                                                       break;\r
-                                               }\r
+                               mceTableDeleteCol : function(grid) {\r
+                                       grid.deleteCols();\r
+                               },\r
 \r
-                                               tableElm = inst.dom.getParent(inst.selection.getNode(), "table");\r
-                                               inst.addVisual(tableElm);\r
-                                               inst.nodeChanged();\r
-                                       }\r
+                               mceTableDeleteRow : function(grid) {\r
+                                       grid.deleteRows();\r
+                               },\r
 \r
-                               return true;\r
-                       }\r
+                               mceTableCutRow : function(grid) {\r
+                                       clipboardRows = grid.cutRows();\r
+                               },\r
+\r
+                               mceTableCopyRow : function(grid) {\r
+                                       clipboardRows = grid.copyRows();\r
+                               },\r
+\r
+                               mceTablePasteRowBefore : function(grid) {\r
+                                       grid.pasteRows(clipboardRows, true);\r
+                               },\r
+\r
+                               mceTablePasteRowAfter : function(grid) {\r
+                                       grid.pasteRows(clipboardRows);\r
+                               },\r
 \r
-                       // Pass to next handler in chain\r
-                       return false;\r
+                               mceTableDelete : function(grid) {\r
+                                       grid.deleteTable();\r
+                               }\r
+                       }, function(func, name) {\r
+                               ed.addCommand(name, function() {\r
+                                       var grid = createTableGrid();\r
+\r
+                                       if (grid) {\r
+                                               func(grid);\r
+                                               ed.execCommand('mceRepaint');\r
+                                               cleanup();\r
+                                       }\r
+                               });\r
+                       });\r
+\r
+                       // Register dialog commands\r
+                       each({\r
+                               mceInsertTable : function(val) {\r
+                                       winMan.open({\r
+                                               url : url + '/table.htm',\r
+                                               width : 400 + parseInt(ed.getLang('table.table_delta_width', 0)),\r
+                                               height : 320 + parseInt(ed.getLang('table.table_delta_height', 0)),\r
+                                               inline : 1\r
+                                       }, {\r
+                                               plugin_url : url,\r
+                                               action : val ? val.action : 0\r
+                                       });\r
+                               },\r
+\r
+                               mceTableRowProps : function() {\r
+                                       winMan.open({\r
+                                               url : url + '/row.htm',\r
+                                               width : 400 + parseInt(ed.getLang('table.rowprops_delta_width', 0)),\r
+                                               height : 295 + parseInt(ed.getLang('table.rowprops_delta_height', 0)),\r
+                                               inline : 1\r
+                                       }, {\r
+                                               plugin_url : url\r
+                                       });\r
+                               },\r
+\r
+                               mceTableCellProps : function() {\r
+                                       winMan.open({\r
+                                               url : url + '/cell.htm',\r
+                                               width : 400 + parseInt(ed.getLang('table.cellprops_delta_width', 0)),\r
+                                               height : 295 + parseInt(ed.getLang('table.cellprops_delta_height', 0)),\r
+                                               inline : 1\r
+                                       }, {\r
+                                               plugin_url : url\r
+                                       });\r
+                               }\r
+                       }, function(func, name) {\r
+                               ed.addCommand(name, function(ui, val) {\r
+                                       func(val);\r
+                               });\r
+                       });\r
                }\r
        });\r
 \r
        // Register plugin\r
        tinymce.PluginManager.add('table', tinymce.plugins.TablePlugin);\r
-})();
\ No newline at end of file
+})(tinymce);
\ No newline at end of file