X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Ftiny_mce%2Fplugins%2Ftable%2Feditor_plugin_src.js;h=ccfe808f683cb339b17d6f0c7b6924a52674b59a;hb=b05f4eef4014db3885787ef15107cba93c932ac9;hp=26ccb1b25c86361a6f5da3d1a755ace31cc35d4c;hpb=0966944b26bb1e6f22eca4aeb5234f29d6ad0a3b;p=citadel.git

diff --git a/webcit/tiny_mce/plugins/table/editor_plugin_src.js b/webcit/tiny_mce/plugins/table/editor_plugin_src.js
index 26ccb1b25..ccfe808f6 100644
--- a/webcit/tiny_mce/plugins/table/editor_plugin_src.js
+++ b/webcit/tiny_mce/plugins/table/editor_plugin_src.js
@@ -1,1049 +1,1364 @@
-/* Import plugin specific language pack */
-tinyMCE.importPluginLanguagePack('table', 'en,ar,cs,da,de,el,es,fi,fr_ca,hu,it,ja,ko,nl,no,pl,pt,sv,tw,zh_cn,fr,de');
-
-function TinyMCE_table_getInfo() {
-	return {
-		longname : 'Tables',
-		author : 'Moxiecode Systems',
-		authorurl : 'http://tinymce.moxiecode.com',
-		infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_table.html',
-		version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
-	};
-};
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
 
-function TinyMCE_table_initInstance(inst) {
-	if (tinyMCE.isGecko) {
-		var doc = inst.getDoc();
+(function(tinymce) {
+	var each = tinymce.each;
 
-		tinyMCE.addEvent(doc, "mouseup", TinyMCE_table_mouseDownHandler);
+	// Checks if the selection/caret is at the start of the specified block element
+	function isAtStart(rng, par) {
+		var doc = par.ownerDocument, rng2 = doc.createRange(), elm;
 
-		try {
-			// For future FF versions
-			doc.execCommand('enableInlineTableEditing', false, false);
-		} catch (e) {
-			// Ignore
-		}
-	}
+		rng2.setStartBefore(par);
+		rng2.setEnd(rng.endContainer, rng.endOffset);
 
-	inst.tableRowClipboard = null;
-}
+		elm = doc.createElement('body');
+		elm.appendChild(rng2.cloneContents());
 
-function TinyMCE_table_mouseDownHandler(e) {
-	var elm = tinyMCE.isMSIE ? event.srcElement : e.target;
-	var focusElm = tinyMCE.selectedInstance.getFocusElement();
+		// Check for text characters of other elements that should be treated as content
+		return elm.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi, '-').replace(/<[^>]+>/g, '').length == 0;
+	};
 
-	// If press on special Mozilla create TD/TR thingie
-	if (elm.nodeName == "BODY" && (focusElm.nodeName == "TD" || focusElm.nodeName == "TH" || (focusElm.parentNode && focusElm.parentNode.nodeName == "TD") ||(focusElm.parentNode && focusElm.parentNode.nodeName == "TH") )) {
-		window.setTimeout(function() {
-			var tableElm = tinyMCE.getParentElement(focusElm, "table");
-			tinyMCE.handleVisualAid(tableElm, true, tinyMCE.settings['visual'], tinyMCE.selectedInstance);
-		}, 10);
+	function getSpanVal(td, name) {
+		return parseInt(td.getAttribute(name) || 1);
 	}
-}
 
-/**
- * Returns the HTML contents of the table control.
- */
-function TinyMCE_table_getControlHTML(control_name) {
-	var controls = new Array(
-		['table', 'table.gif', '{$lang_table_desc}', 'mceInsertTable', true],
-		['delete_col', 'table_delete_col.gif', '{$lang_table_delete_col_desc}', 'mceTableDeleteCol'],
-		['delete_row', 'table_delete_row.gif', '{$lang_table_delete_row_desc}', 'mceTableDeleteRow'],
-		['col_after', 'table_insert_col_after.gif', '{$lang_table_col_after_desc}', 'mceTableInsertColAfter'],
-		['col_before', 'table_insert_col_before.gif', '{$lang_table_col_before_desc}', 'mceTableInsertColBefore'],
-		['row_after', 'table_insert_row_after.gif', '{$lang_table_row_after_desc}', 'mceTableInsertRowAfter'],
-		['row_before', 'table_insert_row_before.gif', '{$lang_table_row_before_desc}', 'mceTableInsertRowBefore'],
-		['row_props', 'table_row_props.gif', '{$lang_table_row_desc}', 'mceTableRowProps', true],
-		['cell_props', 'table_cell_props.gif', '{$lang_table_cell_desc}', 'mceTableCellProps', true],
-		['split_cells', 'table_split_cells.gif', '{$lang_table_split_cells_desc}', 'mceTableSplitCells', true],
-		['merge_cells', 'table_merge_cells.gif', '{$lang_table_merge_cells_desc}', 'mceTableMergeCells', true]);
-
-	// Render table control
-	for (var i=0; i<controls.length; i++) {
-		var but = controls[i];
-
-		if (but[0] == control_name && (tinyMCE.isMSIE || !tinyMCE.settings['button_tile_map']))
-			return '<a href="javascript:tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + but[3] + '\', ' + (but.length > 4 ? but[4] : false) + (but.length > 5 ? ', \'' + but[5] + '\'' : '') + ');" onmousedown="return false;"><img id="{$editor_id}_' + but[0] + '" src="{$pluginurl}/images/' + but[1] + '" title="' + but[2] + '" width="20" height="20" class="mceButtonDisabled" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" /></a>';
-		else if (but[0] == control_name)
-			return '<a href="javascript:tinyMCE.execInstanceCommand(\'{$editor_id}\',\'' + but[3] + '\', ' + (but.length > 4 ? but[4] : false) + (but.length > 5 ? ', \'' + but[5] + '\'' : '') + ');" onmousedown="return false;"><img id="{$editor_id}_' + but[0] + '" src="{$themeurl}/images/spacer.gif" style="background-image:url({$pluginurl}/images/buttons.gif); background-position: ' + (0-(i*20)) + 'px 0px" title="' + but[2] + '" width="20" height="20" class="mceButtonDisabled" onmouseover="tinyMCE.switchClass(this,\'mceButtonOver\');" onmouseout="tinyMCE.restoreClass(this);" onmousedown="tinyMCE.restoreAndSwitchClass(this,\'mceButtonDown\');" /></a>';
-	}
+	/**
+	 * Table Grid class.
+	 */
+	function TableGrid(table, dom, selection) {
+		var grid, startPos, endPos, selectedCell;
+
+		buildGrid();
+		selectedCell = dom.getParent(selection.getStart(), 'th,td');
+		if (selectedCell) {
+			startPos = getPos(selectedCell);
+			endPos = findEndPos();
+			selectedCell = getCell(startPos.x, startPos.y);
+		}
 
-	// Special tablecontrols
-	if (control_name == "tablecontrols") {
-		var html = "";
-
-		html += tinyMCE.getControlHTML("table");
-		html += tinyMCE.getControlHTML("separator");
-		html += tinyMCE.getControlHTML("row_props");
-		html += tinyMCE.getControlHTML("cell_props");
-		html += tinyMCE.getControlHTML("separator");
-		html += tinyMCE.getControlHTML("row_before");
-		html += tinyMCE.getControlHTML("row_after");
-		html += tinyMCE.getControlHTML("delete_row");
-		html += tinyMCE.getControlHTML("separator");
-		html += tinyMCE.getControlHTML("col_before");
-		html += tinyMCE.getControlHTML("col_after");
-		html += tinyMCE.getControlHTML("delete_col");
-		html += tinyMCE.getControlHTML("separator");
-		html += tinyMCE.getControlHTML("split_cells");
-		html += tinyMCE.getControlHTML("merge_cells");
-
-		return html;
-	}
+		function cloneNode(node, children) {
+			node = node.cloneNode(children);
+			node.removeAttribute('id');
 
-	return "";
-}
+			return node;
+		}
 
-/**
- * Executes the table commands.
- */
-function TinyMCE_table_execCommand(editor_id, element, command, user_interface, value) {
-	// Is table command
-	switch (command) {
-		case "mceInsertTable":
-		case "mceTableRowProps":
-		case "mceTableCellProps":
-		case "mceTableSplitCells":
-		case "mceTableMergeCells":
-		case "mceTableInsertRowBefore":
-		case "mceTableInsertRowAfter":
-		case "mceTableDeleteRow":
-		case "mceTableInsertColBefore":
-		case "mceTableInsertColAfter":
-		case "mceTableDeleteCol":
-		case "mceTableCutRow":
-		case "mceTableCopyRow":
-		case "mceTablePasteRowBefore":
-		case "mceTablePasteRowAfter":
-		case "mceTableDelete":
-			var inst = tinyMCE.getInstanceById(editor_id);
-
-			inst.execCommand('mceBeginUndoLevel');
-			TinyMCE_table_doExecCommand(editor_id, element, command, user_interface, value);
-			inst.execCommand('mceEndUndoLevel');
-
-			return true;
-	}
+		function buildGrid() {
+			var startY = 0;
 
-	// Pass to next handler in chain
-	return false;
-}
+			grid = [];
 
-/**
- * Executes the table commands.
- */
-function TinyMCE_table_doExecCommand(editor_id, element, command, user_interface, value) {
-	var inst = tinyMCE.getInstanceById(editor_id);
-	var focusElm = inst.getFocusElement();
-	var trElm = tinyMCE.getParentElement(focusElm, "tr");
-	var tdElm = tinyMCE.getParentElement(focusElm, "td,th");
-	var tableElm = tinyMCE.getParentElement(focusElm, "table");
-	var doc = inst.contentWindow.document;
-	var tableBorder = tableElm ? tableElm.getAttribute("border") : "";
-
-	// Get first TD if no TD found
-	if (trElm && tdElm == null)
-		tdElm = trElm.cells[0];
-
-	// ------- Inner functions ---------
-	function inArray(ar, v) {
-		for (var i=0; i<ar.length; i++) {
-			// Is array
-			if (ar[i].length > 0 && inArray(ar[i], v))
-				return true;
-
-			// Found value
-			if (ar[i] == v)
-				return true;
-		}
+			each(['thead', 'tbody', 'tfoot'], function(part) {
+				var rows = dom.select('> ' + part + ' tr', table);
 
-		return false;
-	}
+				each(rows, function(tr, y) {
+					y += startY;
 
-	function makeTD() {
-		var newTD = doc.createElement("td");
-		newTD.innerHTML = "&nbsp;";
-	}
+					each(dom.select('> td, > th', tr), function(td, x) {
+						var x2, y2, rowspan, colspan;
+
+						// Skip over existing cells produced by rowspan
+						if (grid[y]) {
+							while (grid[y][x])
+								x++;
+						}
 
-	function getColRowSpan(td) {
-		var colspan = tinyMCE.getAttrib(td, "colspan");
-		var rowspan = tinyMCE.getAttrib(td, "rowspan");
+						// Get col/rowspan from cell
+						rowspan = getSpanVal(td, 'rowspan');
+						colspan = getSpanVal(td, 'colspan');
+
+						// Fill out rowspan/colspan right and down
+						for (y2 = y; y2 < y + rowspan; y2++) {
+							if (!grid[y2])
+								grid[y2] = [];
+
+							for (x2 = x; x2 < x + colspan; x2++) {
+								grid[y2][x2] = {
+									part : part,
+									real : y2 == y && x2 == x,
+									elm : td,
+									rowspan : rowspan,
+									colspan : colspan
+								};
+							}
+						}
+					});
+				});
 
-		colspan = colspan == "" ? 1 : parseInt(colspan);
-		rowspan = rowspan == "" ? 1 : parseInt(rowspan);
+				startY += rows.length;
+			});
+		};
 
-		return {colspan : colspan, rowspan : rowspan};
-	}
+		function getCell(x, y) {
+			var row;
 
-	function getCellPos(grid, td) {
-		for (var y=0; y<grid.length; y++) {
-			for (var x=0; x<grid[y].length; x++) {
-				if (grid[y][x] == td)
-					return {cellindex : x, rowindex : y};
+			row = grid[y];
+			if (row)
+				return row[x];
+		};
+
+		function setSpanVal(td, name, val) {
+			if (td) {
+				val = parseInt(val);
+
+				if (val === 1)
+					td.removeAttribute(name, 1);
+				else
+					td.setAttribute(name, val, 1);
 			}
 		}
 
-		return null;
-	}
+		function isCellSelected(cell) {
+			return cell && (dom.hasClass(cell.elm, 'mceSelected') || cell == selectedCell);
+		};
 
-	function getCell(grid, row, col) {
-		if (grid[row] && grid[row][col])
-			return grid[row][col];
+		function getSelectedRows() {
+			var rows = [];
 
-		return null;
-	}
+			each(table.rows, function(row) {
+				each(row.cells, function(cell) {
+					if (dom.hasClass(cell, 'mceSelected') || cell == selectedCell.elm) {
+						rows.push(row);
+						return false;
+					}
+				});
+			});
 
-	function getTableGrid(table) {
-		var grid = new Array();
-		var rows = table.rows;
+			return rows;
+		};
 
-		for (var y=0; y<rows.length; y++) {
-			for (var x=0; x<rows[y].cells.length; x++) {
-				var td = rows[y].cells[x];
-				var sd = getColRowSpan(td);
+		function deleteTable() {
+			var rng = dom.createRng();
 
-				// All ready filled
-				for (xstart = x; grid[y] && grid[y][xstart]; xstart++) ;
+			rng.setStartAfter(table);
+			rng.setEndAfter(table);
 
-				// Fill box
-				for (var y2=y; y2<y+sd['rowspan']; y2++) {
-					if (!grid[y2])
-						grid[y2] = new Array();
+			selection.setRng(rng);
 
-					for (var x2=xstart; x2<xstart+sd['colspan']; x2++) {
-						grid[y2][x2] = td;
-					}
-				}
-			}
-		}
+			dom.remove(table);
+		};
 
-		return grid;
-	}
+		function cloneCell(cell) {
+			var formatNode;
+
+			// Clone formats
+			tinymce.walk(cell, function(node) {
+				var curNode;
+
+				if (node.nodeType == 3) {
+					each(dom.getParents(node.parentNode, null, cell).reverse(), function(node) {
+						node = cloneNode(node, false);
 
-	function trimRow(table, tr, td, new_tr) {
-		var grid = getTableGrid(table);
-		var cpos = getCellPos(grid, td);
-
-		// Time to crop away some
-		if (new_tr.cells.length != tr.childNodes.length) {
-			var cells = tr.childNodes;
-			var lastElm = null;
-
-			for (var x=0; td = getCell(grid, cpos.rowindex, x); x++) {
-				var remove = true;
-				var sd = getColRowSpan(td);
-
-				// Remove due to rowspan
-				if (inArray(cells, td)) {
-					new_tr.childNodes[x]._delete = true;
-				} else if ((lastElm == null || td != lastElm) && sd.colspan > 1) { // Remove due to colspan
-					for (var i=x; i<x+td.colSpan; i++)
-						new_tr.childNodes[i]._delete = true;
+						if (!formatNode)
+							formatNode = curNode = node;
+						else if (curNode)
+							curNode.appendChild(node);
+
+						curNode = node;
+					});
+
+					// Add something to the inner node
+					if (curNode)
+						curNode.innerHTML = tinymce.isIE ? '&nbsp;' : '<br data-mce-bogus="1" />';
+
+					return false;
 				}
+			}, 'childNodes');
 
-				if ((lastElm == null || td != lastElm) && sd.rowspan > 1)
-					td.rowSpan = sd.rowspan + 1;
+			cell = cloneNode(cell, false);
+			setSpanVal(cell, 'rowSpan', 1);
+			setSpanVal(cell, 'colSpan', 1);
 
-				lastElm = td;
+			if (formatNode) {
+				cell.appendChild(formatNode);
+			} else {
+				if (!tinymce.isIE)
+					cell.innerHTML = '<br data-mce-bogus="1" />';
 			}
 
-			deleteMarked(tableElm);
-		}
-	}
+			return cell;
+		};
+
+		function cleanup() {
+			var rng = dom.createRng();
+
+			// Empty rows
+			each(dom.select('tr', table), function(tr) {
+				if (tr.cells.length == 0)
+					dom.remove(tr);
+			});
+
+			// Empty table
+			if (dom.select('tr', table).length == 0) {
+				rng.setStartAfter(table);
+				rng.setEndAfter(table);
+				selection.setRng(rng);
+				dom.remove(table);
+				return;
+			}
 
-	function prevElm(node, name) {
-		while ((node = node.previousSibling) != null) {
-			if (node.nodeName == name)
-				return node;
-		}
+			// Empty header/body/footer
+			each(dom.select('thead,tbody,tfoot', table), function(part) {
+				if (part.rows.length == 0)
+					dom.remove(part);
+			});
 
-		return null;
-	}
+			// Restore selection to start position if it still exists
+			buildGrid();
 
-	function nextElm(node, names) {
+			// Restore the selection to the closest table position
+			row = grid[Math.min(grid.length - 1, startPos.y)];
+			if (row) {
+				selection.select(row[Math.min(row.length - 1, startPos.x)].elm, true);
+				selection.collapse(true);
+			}
+		};
 
-        var namesAr = names.split(',');
+		function fillLeftDown(x, y, rows, cols) {
+			var tr, x2, r, c, cell;
 
-		while ((node = node.nextSibling) != null) {
-            for (var i=0; i<namesAr.length; i++) {
-                if (node.nodeName.toLowerCase() == namesAr[i].toLowerCase() )
-                    return node;
-            }
-		}
+			tr = grid[y][x].elm.parentNode;
+			for (r = 1; r <= rows; r++) {
+				tr = dom.getNext(tr, 'tr');
 
-		return null;
-	}
+				if (tr) {
+					// Loop left to find real cell
+					for (x2 = x; x2 >= 0; x2--) {
+						cell = grid[y + r][x2].elm;
 
-	function deleteMarked(tbl) {
-		if (tbl.rows == 0)
-			return;
+						if (cell.parentNode == tr) {
+							// Append clones after
+							for (c = 1; c <= cols; c++)
+								dom.insertAfter(cloneCell(cell), cell);
 
-		var tr = tbl.rows[0];
-		do {
-			var next = nextElm(tr, "TR");
+							break;
+						}
+					}
 
-			// Delete row
-			if (tr._delete) {
-				tr.parentNode.removeChild(tr);
-				continue;
+					if (x2 == -1) {
+						// Insert nodes before first cell
+						for (c = 1; c <= cols; c++)
+							tr.insertBefore(cloneCell(tr.cells[0]), tr.cells[0]);
+					}
+				}
 			}
+		};
 
-			// Delete cells
-			var td = tr.cells[0];
-			if (td.cells > 1) {
-				do {
-					var nexttd = nextElm(td, "TD,TH");
+		function split() {
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					var colSpan, rowSpan, newCell, i;
 
-					if (td._delete)
-						td.parentNode.removeChild(td);
-				} while ((td = nexttd) != null);
-			}
-		} while ((tr = next) != null);
-	}
+					if (isCellSelected(cell)) {
+						cell = cell.elm;
+						colSpan = getSpanVal(cell, 'colspan');
+						rowSpan = getSpanVal(cell, 'rowspan');
 
-	function addRows(td_elm, tr_elm, rowspan) {
-		// Add rows
-		td_elm.rowSpan = 1;
-		var trNext = nextElm(tr_elm, "TR");
-		for (var i=1; i<rowspan && trNext; i++) {
-			var newTD = doc.createElement("td");
-			newTD.innerHTML = "&nbsp;";
+						if (colSpan > 1 || rowSpan > 1) {
+							setSpanVal(cell, 'rowSpan', 1);
+							setSpanVal(cell, 'colSpan', 1);
 
-			if (tinyMCE.isMSIE)
-				trNext.insertBefore(newTD, trNext.cells(td_elm.cellIndex));
-			else
-				trNext.insertBefore(newTD, trNext.cells[td_elm.cellIndex]);
+							// Insert cells right
+							for (i = 0; i < colSpan - 1; i++)
+								dom.insertAfter(cloneCell(cell), cell);
 
-			trNext = nextElm(trNext, "TR");
-		}
-	}
+							fillLeftDown(x, y, rowSpan - 1, colSpan);
+						}
+					}
+				});
+			});
+		};
+
+		function merge(cell, cols, rows) {
+			var startX, startY, endX, endY, x, y, startCell, endCell, cell, children, count;
+
+			// Use specified cell and cols/rows
+			if (cell) {
+				pos = getPos(cell);
+				startX = pos.x;
+				startY = pos.y;
+				endX = startX + (cols - 1);
+				endY = startY + (rows - 1);
+			} else {
+				// Use selection
+				startX = startPos.x;
+				startY = startPos.y;
+				endX = endPos.x;
+				endY = endPos.y;
+			}
 
-	function copyRow(doc, table, tr) {
-		var grid = getTableGrid(table);
-		var newTR = tr.cloneNode(false);
-		var cpos = getCellPos(grid, tr.cells[0]);
-		var lastCell = null;
-		var tableBorder = tinyMCE.getAttrib(table, "border");
-		var tdElm = null;
-
-		for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
-			var newTD = null;
-
-			if (lastCell != tdElm) {
-				for (var i=0; i<tr.cells.length; i++) {
-					if (tdElm == tr.cells[i]) {
-						newTD = tdElm.cloneNode(true);
-						break;
+			// Find start/end cells
+			startCell = getCell(startX, startY);
+			endCell = getCell(endX, endY);
+
+			// Check if the cells exists and if they are of the same part for example tbody = tbody
+			if (startCell && endCell && startCell.part == endCell.part) {
+				// Split and rebuild grid
+				split();
+				buildGrid();
+
+				// Set row/col span to start cell
+				startCell = getCell(startX, startY).elm;
+				setSpanVal(startCell, 'colSpan', (endX - startX) + 1);
+				setSpanVal(startCell, 'rowSpan', (endY - startY) + 1);
+
+				// Remove other cells and add it's contents to the start cell
+				for (y = startY; y <= endY; y++) {
+					for (x = startX; x <= endX; x++) {
+						if (!grid[y] || !grid[y][x])
+							continue;
+
+						cell = grid[y][x].elm;
+
+						if (cell != startCell) {
+							// Move children to startCell
+							children = tinymce.grep(cell.childNodes);
+							each(children, function(node) {
+								startCell.appendChild(node);
+							});
+
+							// Remove bogus nodes if there is children in the target cell
+							if (children.length) {
+								children = tinymce.grep(startCell.childNodes);
+								count = 0;
+								each(children, function(node) {
+									if (node.nodeName == 'BR' && dom.getAttrib(node, 'data-mce-bogus') && count++ < children.length - 1)
+										startCell.removeChild(node);
+								});
+							}
+							
+							// Remove cell
+							dom.remove(cell);
+						}
 					}
 				}
-			}
 
-			if (newTD == null) {
-				newTD = doc.createElement("td");
-				newTD.innerHTML = "&nbsp;";
+				// Remove empty rows etc and restore caret location
+				cleanup();
 			}
+		};
+
+		function insertRow(before) {
+			var posY, cell, lastCell, x, rowElm, newRow, newCell, otherCell, rowSpan;
+
+			// Find first/last row
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (isCellSelected(cell)) {
+						cell = cell.elm;
+						rowElm = cell.parentNode;
+						newRow = cloneNode(rowElm, false);
+						posY = y;
+
+						if (before)
+							return false;
+					}
+				});
 
-			// Reset col/row span
-			newTD.colSpan = 1;
-			newTD.rowSpan = 1;
+				if (before)
+					return !posY;
+			});
 
-			newTR.appendChild(newTD);
+			for (x = 0; x < grid[0].length; x++) {
+				// Cell not found could be because of an invalid table structure
+				if (!grid[posY][x])
+					continue;
 
-			lastCell = tdElm;
-		}
+				cell = grid[posY][x].elm;
 
-		return newTR;
-	}
+				if (cell != lastCell) {
+					if (!before) {
+						rowSpan = getSpanVal(cell, 'rowspan');
+						if (rowSpan > 1) {
+							setSpanVal(cell, 'rowSpan', rowSpan + 1);
+							continue;
+						}
+					} else {
+						// Check if cell above can be expanded
+						if (posY > 0 && grid[posY - 1][x]) {
+							otherCell = grid[posY - 1][x].elm;
+							rowSpan = getSpanVal(otherCell, 'rowSpan');
+							if (rowSpan > 1) {
+								setSpanVal(otherCell, 'rowSpan', rowSpan + 1);
+								continue;
+							}
+						}
+					}
 
-	// ---- Commands -----
+					// Insert new cell into new row
+					newCell = cloneCell(cell);
+					setSpanVal(newCell, 'colSpan', cell.colSpan);
 
-	// Handle commands
-	switch (command) {
-		case "mceTableRowProps":
-			if (trElm == null)
-				return true;
+					newRow.appendChild(newCell);
 
-			if (user_interface) {
-				// Setup template
-				var template = new Array();
+					lastCell = cell;
+				}
+			}
 
-				template['file'] = '../../plugins/table/row.htm';
-				template['width'] = 380;
-				template['height'] = 295;
+			if (newRow.hasChildNodes()) {
+				if (!before)
+					dom.insertAfter(newRow, rowElm);
+				else
+					rowElm.parentNode.insertBefore(newRow, rowElm);
+			}
+		};
 
-				// Language specific width and height addons
-				template['width'] += tinyMCE.getLang('lang_table_rowprops_delta_width', 0);
-				template['height'] += tinyMCE.getLang('lang_table_rowprops_delta_width', 0);
+		function insertCol(before) {
+			var posX, lastCell;
 
-				// Open window
-				tinyMCE.openWindow(template, {editor_id : inst.editorId, inline : "yes"});
-			}
+			// Find first/last column
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (isCellSelected(cell)) {
+						posX = x;
 
-			return true;
+						if (before)
+							return false;
+					}
+				});
 
-		case "mceTableCellProps":
-			if (tdElm == null)
-				return true;
+				if (before)
+					return !posX;
+			});
 
-			if (user_interface) {
-				// Setup template
-				var template = new Array();
+			each(grid, function(row, y) {
+				var cell, rowSpan, colSpan;
 
-				template['file'] = '../../plugins/table/cell.htm';
-				template['width'] = 380;
-				template['height'] = 295;
+				if (!row[posX])
+					return;
 
-				// Language specific width and height addons
-				template['width'] += tinyMCE.getLang('lang_table_cellprops_delta_width', 0);
-				template['height'] += tinyMCE.getLang('lang_table_cellprops_delta_width', 0);
+				cell = row[posX].elm;
+				if (cell != lastCell) {
+					colSpan = getSpanVal(cell, 'colspan');
+					rowSpan = getSpanVal(cell, 'rowspan');
 
-				// Open window
-				tinyMCE.openWindow(template, {editor_id : inst.editorId, inline : "yes"});
-			}
+					if (colSpan == 1) {
+						if (!before) {
+							dom.insertAfter(cloneCell(cell), cell);
+							fillLeftDown(posX, y, rowSpan - 1, colSpan);
+						} else {
+							cell.parentNode.insertBefore(cloneCell(cell), cell);
+							fillLeftDown(posX, y, rowSpan - 1, colSpan);
+						}
+					} else
+						setSpanVal(cell, 'colSpan', cell.colSpan + 1);
 
-			return true;
+					lastCell = cell;
+				}
+			});
+		};
 
-		case "mceInsertTable":
-			if (user_interface) {
-				// Setup template
-				var template = new Array();
+		function deleteCols() {
+			var cols = [];
 
-				template['file'] = '../../plugins/table/table.htm';
-				template['width'] = 380;
-				template['height'] = 295;
+			// Get selected column indexes
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (isCellSelected(cell) && tinymce.inArray(cols, x) === -1) {
+						each(grid, function(row) {
+							var cell = row[x].elm, colSpan;
 
-				// Language specific width and height addons
-				template['width'] += tinyMCE.getLang('lang_insert_table_delta_width', 0);
-				template['height'] += tinyMCE.getLang('lang_insert_table_delta_height', 0);
+							colSpan = getSpanVal(cell, 'colSpan');
 
-				// Open window
-				tinyMCE.openWindow(template, {editor_id : inst.editorId, inline : "yes", action : value});
-			}
+							if (colSpan > 1)
+								setSpanVal(cell, 'colSpan', colSpan - 1);
+							else
+								dom.remove(cell);
+						});
 
-			return true;
+						cols.push(x);
+					}
+				});
+			});
 
-		case "mceTableDelete":
-			var table = tinyMCE.getParentElement(inst.getFocusElement(), "table");
-			if (table) {
-				table.parentNode.removeChild(table);
-				inst.repaint();
-			}
-			return true;
-
-		case "mceTableSplitCells":
-		case "mceTableMergeCells":
-		case "mceTableInsertRowBefore":
-		case "mceTableInsertRowAfter":
-		case "mceTableDeleteRow":
-		case "mceTableInsertColBefore":
-		case "mceTableInsertColAfter":
-		case "mceTableDeleteCol":
-		case "mceTableCutRow":
-		case "mceTableCopyRow":
-		case "mceTablePasteRowBefore":
-		case "mceTablePasteRowAfter":
-			// No table just return (invalid command)
-			if (!tableElm)
-				return true;
-
-			// Table has a tbody use that reference
-			// Changed logic by ApTest 2005.07.12 (www.aptest.com)
-			// Now lookk at the focused element and take its parentNode.  That will be a tbody or a table.
-			if (tableElm != trElm.parentNode)
-				tableElm = trElm.parentNode;
-
-			if (tableElm && trElm) {
-				switch (command) {
-					case "mceTableInsertRowBefore":
-						if (!trElm || !tdElm)
-							return true;
-
-						var grid = getTableGrid(tableElm);
-						var cpos = getCellPos(grid, tdElm);
-						var newTR = doc.createElement("tr");
-						var lastTDElm = null;
-
-						cpos.rowindex--;
-						if (cpos.rowindex < 0)
-							cpos.rowindex = 0;
-
-						// Create cells
-						for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
-							if (tdElm != lastTDElm) {
-								var sd = getColRowSpan(tdElm);
-
-								if (sd['rowspan'] == 1) {
-									var newTD = doc.createElement("td");
-
-									newTD.innerHTML = "&nbsp;";
-									newTD.colSpan = tdElm.colSpan;
-
-									newTR.appendChild(newTD);
-								} else
-									tdElm.rowSpan = sd['rowspan'] + 1;
-
-								lastTDElm = tdElm;
-							}
-						}
+			cleanup();
+		};
 
-						trElm.parentNode.insertBefore(newTR, trElm);
-					break;
+		function deleteRows() {
+			var rows;
 
-					case "mceTableCutRow":
-						if (!trElm || !tdElm)
-							return true;
+			function deleteRow(tr) {
+				var nextTr, pos, lastCell;
 
-						inst.tableRowClipboard = copyRow(doc, tableElm, trElm);
-						inst.execCommand("mceTableDeleteRow");
-						break;
+				nextTr = dom.getNext(tr, 'tr');
 
-					case "mceTableCopyRow":
-						if (!trElm || !tdElm)
-							return true;
+				// Move down row spanned cells
+				each(tr.cells, function(cell) {
+					var rowSpan = getSpanVal(cell, 'rowSpan');
 
-						inst.tableRowClipboard = copyRow(doc, tableElm, trElm);
-						break;
+					if (rowSpan > 1) {
+						setSpanVal(cell, 'rowSpan', rowSpan - 1);
+						pos = getPos(cell);
+						fillLeftDown(pos.x, pos.y, 1, 1);
+					}
+				});
 
-					case "mceTablePasteRowBefore":
-						if (!trElm || !tdElm)
-							return true;
+				// Delete cells
+				pos = getPos(tr.cells[0]);
+				each(grid[pos.y], function(cell) {
+					var rowSpan;
 
-						var newTR = inst.tableRowClipboard.cloneNode(true);
+					cell = cell.elm;
 
-						var prevTR = prevElm(trElm, "TR");
-						if (prevTR != null)
-							trimRow(tableElm, prevTR, prevTR.cells[0], newTR);
+					if (cell != lastCell) {
+						rowSpan = getSpanVal(cell, 'rowSpan');
 
-						trElm.parentNode.insertBefore(newTR, trElm);
-						break;
+						if (rowSpan <= 1)
+							dom.remove(cell);
+						else
+							setSpanVal(cell, 'rowSpan', rowSpan - 1);
 
-					case "mceTablePasteRowAfter":
-						if (!trElm || !tdElm)
-							return true;
-						
-						var nextTR = nextElm(trElm, "TR");
-						var newTR = inst.tableRowClipboard.cloneNode(true);
+						lastCell = cell;
+					}
+				});
+			};
 
-						trimRow(tableElm, trElm, tdElm, newTR);
+			// Get selected rows and move selection out of scope
+			rows = getSelectedRows();
 
-						if (nextTR == null)
-							trElm.parentNode.appendChild(newTR);
-						else
-							nextTR.parentNode.insertBefore(newTR, nextTR);
+			// Delete all selected rows
+			each(rows.reverse(), function(tr) {
+				deleteRow(tr);
+			});
 
-						break;
+			cleanup();
+		};
 
-					case "mceTableInsertRowAfter":
-						if (!trElm || !tdElm)
-							return true;
+		function cutRows() {
+			var rows = getSelectedRows();
 
-						var grid = getTableGrid(tableElm);
-						var cpos = getCellPos(grid, tdElm);
-						var newTR = doc.createElement("tr");
-						var lastTDElm = null;
+			dom.remove(rows);
+			cleanup();
 
-						// Create cells
-						for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
-							if (tdElm != lastTDElm) {
-								var sd = getColRowSpan(tdElm);
+			return rows;
+		};
 
-								if (sd['rowspan'] == 1) {
-									var newTD = doc.createElement("td");
+		function copyRows() {
+			var rows = getSelectedRows();
 
-									newTD.innerHTML = "&nbsp;";
-									newTD.colSpan = tdElm.colSpan;
+			each(rows, function(row, i) {
+				rows[i] = cloneNode(row, true);
+			});
 
-									newTR.appendChild(newTD);
-								} else
-									tdElm.rowSpan = sd['rowspan'] + 1;
+			return rows;
+		};
 
-								lastTDElm = tdElm;
-							}
-						}
+		function pasteRows(rows, before) {
+			var selectedRows = getSelectedRows(),
+				targetRow = selectedRows[before ? 0 : selectedRows.length - 1],
+				targetCellCount = targetRow.cells.length;
 
-						if (newTR.hasChildNodes()) {
-							var nextTR = nextElm(trElm, "TR");
-							if (nextTR)
-								nextTR.parentNode.insertBefore(newTR, nextTR);
-							else
-								tableElm.appendChild(newTR);
-						}
-					break;
-
-					case "mceTableDeleteRow":
-						if (!trElm || !tdElm)
-							return true;
-	
-						var grid = getTableGrid(tableElm);
-						var cpos = getCellPos(grid, tdElm);
-
-						// Only one row, remove whole table
-						if (grid.length == 1) {
-							tableElm.parentNode.removeChild(tableElm);
-							return true;
-						}
+			// Calc target cell count
+			each(grid, function(row) {
+				var match;
 
-						// Move down row spanned cells
-						var cells = trElm.cells;
-						var nextTR = nextElm(trElm, "TR");
-						for (var x=0; x<cells.length; x++) {
-							if (cells[x].rowSpan > 1) {
-								var newTD = cells[x].cloneNode(true);
-								var sd = getColRowSpan(cells[x]);
+				targetCellCount = 0;
+				each(row, function(cell, x) {
+					if (cell.real)
+						targetCellCount += cell.colspan;
 
-								newTD.rowSpan = sd.rowspan - 1;
+					if (cell.elm.parentNode == targetRow)
+						match = 1;
+				});
 
-								var nextTD = nextTR.cells[x];
+				if (match)
+					return false;
+			});
 
-								if (nextTD == null)
-									nextTR.appendChild(newTD);
-								else
-									nextTR.insertBefore(newTD, nextTD);
-							}
-						}
+			if (!before)
+				rows.reverse();
 
-						// Delete cells
-						var lastTDElm = null;
-						for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
-							if (tdElm != lastTDElm) {
-								var sd = getColRowSpan(tdElm);
+			each(rows, function(row) {
+				var cellCount = row.cells.length, cell;
 
-								if (sd.rowspan > 1) {
-									tdElm.rowSpan = sd.rowspan - 1;
-								} else {
-									trElm = tdElm.parentNode;
+				// Remove col/rowspans
+				for (i = 0; i < cellCount; i++) {
+					cell = row.cells[i];
+					setSpanVal(cell, 'colSpan', 1);
+					setSpanVal(cell, 'rowSpan', 1);
+				}
 
-									if (trElm.parentNode)
-										trElm._delete = true;
-								}
+				// Needs more cells
+				for (i = cellCount; i < targetCellCount; i++)
+					row.appendChild(cloneCell(row.cells[cellCount - 1]));
+
+				// Needs less cells
+				for (i = targetCellCount; i < cellCount; i++)
+					dom.remove(row.cells[i]);
+
+				// Add before/after
+				if (before)
+					targetRow.parentNode.insertBefore(row, targetRow);
+				else
+					dom.insertAfter(row, targetRow);
+			});
+		};
+
+		function getPos(target) {
+			var pos;
+
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					if (cell.elm == target) {
+						pos = {x : x, y : y};
+						return false;
+					}
+				});
 
-								lastTDElm = tdElm;
-							}
-						}
+				return !pos;
+			});
 
-						deleteMarked(tableElm);
+			return pos;
+		};
 
-						cpos.rowindex--;
-						if (cpos.rowindex < 0)
-							cpos.rowindex = 0;
+		function setStartCell(cell) {
+			startPos = getPos(cell);
+		};
 
-						inst.selectNode(getCell(grid, cpos.rowindex, 0), true, true);
-					break;
+		function findEndPos() {
+			var pos, maxX, maxY;
 
-					case "mceTableInsertColBefore":
-						if (!trElm || !tdElm)
-							return true;
+			maxX = maxY = 0;
 
-						var grid = getTableGrid(tableElm);
-						var cpos = getCellPos(grid, tdElm);
-						var lastTDElm = null;
+			each(grid, function(row, y) {
+				each(row, function(cell, x) {
+					var colSpan, rowSpan;
 
-						for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
-							if (tdElm != lastTDElm) {
-								var sd = getColRowSpan(tdElm);
+					if (isCellSelected(cell)) {
+						cell = grid[y][x];
 
-								if (sd['colspan'] == 1) {
-									var newTD = doc.createElement("td");
+						if (x > maxX)
+							maxX = x;
 
-									newTD.innerHTML = "&nbsp;";
-									newTD.rowSpan = tdElm.rowSpan;
+						if (y > maxY)
+							maxY = y;
 
-									tdElm.parentNode.insertBefore(newTD, tdElm);
-								} else
-									tdElm.colSpan++;
+						if (cell.real) {
+							colSpan = cell.colspan - 1;
+							rowSpan = cell.rowspan - 1;
 
-								lastTDElm = tdElm;
+							if (colSpan) {
+								if (x + colSpan > maxX)
+									maxX = x + colSpan;
+							}
+
+							if (rowSpan) {
+								if (y + rowSpan > maxY)
+									maxY = y + rowSpan;
 							}
 						}
-					break;
+					}
+				});
+			});
 
-					case "mceTableInsertColAfter":
-						if (!trElm || !tdElm)
-							return true;
+			return {x : maxX, y : maxY};
+		};
 
-						var grid = getTableGrid(tableElm);
-						var cpos = getCellPos(grid, tdElm);
-						var lastTDElm = null;
+		function setEndCell(cell) {
+			var startX, startY, endX, endY, maxX, maxY, colSpan, rowSpan;
 
-						for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
-							if (tdElm != lastTDElm) {
-								var sd = getColRowSpan(tdElm);
+			endPos = getPos(cell);
 
-								if (sd['colspan'] == 1) {
-									var newTD = doc.createElement("td");
+			if (startPos && endPos) {
+				// Get start/end positions
+				startX = Math.min(startPos.x, endPos.x);
+				startY = Math.min(startPos.y, endPos.y);
+				endX = Math.max(startPos.x, endPos.x);
+				endY = Math.max(startPos.y, endPos.y);
 
-									newTD.innerHTML = "&nbsp;";
-									newTD.rowSpan = tdElm.rowSpan;
+				// Expand end positon to include spans
+				maxX = endX;
+				maxY = endY;
 
-									var nextTD = nextElm(tdElm, "TD");
-									if (nextTD == null)
-										tdElm.parentNode.appendChild(newTD);
-									else
-										nextTD.parentNode.insertBefore(newTD, nextTD);
-								} else
-									tdElm.colSpan++;
+				// Expand startX
+				for (y = startY; y <= maxY; y++) {
+					cell = grid[y][startX];
 
-								lastTDElm = tdElm;
-							}
-						}
-					break;
+					if (!cell.real) {
+						if (startX - (cell.colspan - 1) < startX)
+							startX -= cell.colspan - 1;
+					}
+				}
 
-					case "mceTableDeleteCol":
-						if (!trElm || !tdElm)
-							return true;
+				// Expand startY
+				for (x = startX; x <= maxX; x++) {
+					cell = grid[startY][x];
 
-						var grid = getTableGrid(tableElm);
-						var cpos = getCellPos(grid, tdElm);
-						var lastTDElm = null;
+					if (!cell.real) {
+						if (startY - (cell.rowspan - 1) < startY)
+							startY -= cell.rowspan - 1;
+					}
+				}
 
-						// Only one col, remove whole table
-						if (grid.length > 1 && grid[0].length <= 1) {
-							tableElm.parentNode.removeChild(tableElm);
-							return true;
-						}
+				// Find max X, Y
+				for (y = startY; y <= endY; y++) {
+					for (x = startX; x <= endX; x++) {
+						cell = grid[y][x];
 
-						// Delete cells
-						for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
-							if (tdElm != lastTDElm) {
-								var sd = getColRowSpan(tdElm);
+						if (cell.real) {
+							colSpan = cell.colspan - 1;
+							rowSpan = cell.rowspan - 1;
 
-								if (sd['colspan'] > 1)
-									tdElm.colSpan = sd['colspan'] - 1;
-								else {
-									if (tdElm.parentNode)
-										tdElm.parentNode.removeChild(tdElm);
-								}
+							if (colSpan) {
+								if (x + colSpan > maxX)
+									maxX = x + colSpan;
+							}
 
-								lastTDElm = tdElm;
+							if (rowSpan) {
+								if (y + rowSpan > maxY)
+									maxY = y + rowSpan;
 							}
 						}
+					}
+				}
 
-						cpos.cellindex--;
-						if (cpos.cellindex < 0)
-							cpos.cellindex = 0;
+				// Remove current selection
+				dom.removeClass(dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');
 
-						inst.selectNode(getCell(grid, 0, cpos.cellindex), true, true);
-					break;
+				// Add new selection
+				for (y = startY; y <= maxY; y++) {
+					for (x = startX; x <= maxX; x++) {
+						if (grid[y][x])
+							dom.addClass(grid[y][x].elm, 'mceSelected');
+					}
+				}
+			}
+		};
+
+		// Expose to public
+		tinymce.extend(this, {
+			deleteTable : deleteTable,
+			split : split,
+			merge : merge,
+			insertRow : insertRow,
+			insertCol : insertCol,
+			deleteCols : deleteCols,
+			deleteRows : deleteRows,
+			cutRows : cutRows,
+			copyRows : copyRows,
+			pasteRows : pasteRows,
+			getPos : getPos,
+			setStartCell : setStartCell,
+			setEndCell : setEndCell
+		});
+	};
 
-				case "mceTableSplitCells":
-					if (!trElm || !tdElm)
-						return true;
+	tinymce.create('tinymce.plugins.TablePlugin', {
+		init : function(ed, url) {
+			var winMan, clipboardRows, hasCellSelection = true; // Might be selected cells on reload
 
-					var spandata = getColRowSpan(tdElm);
+			function createTableGrid(node) {
+				var selection = ed.selection, tblElm = ed.dom.getParent(node || selection.getNode(), 'table');
 
-					var colspan = spandata["colspan"];
-					var rowspan = spandata["rowspan"];
+				if (tblElm)
+					return new TableGrid(tblElm, ed.dom, selection);
+			};
 
-					// Needs splitting
-					if (colspan > 1 || rowspan > 1) {
-						// Generate cols
-						tdElm.colSpan = 1;
-						for (var i=1; i<colspan; i++) {
-							var newTD = doc.createElement("td");
+			function cleanup() {
+				// Restore selection possibilities
+				ed.getBody().style.webkitUserSelect = '';
 
-							newTD.innerHTML = "&nbsp;";
+				if (hasCellSelection) {
+					ed.dom.removeClass(ed.dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');
+					hasCellSelection = false;
+				}
+			};
+
+			// Register buttons
+			each([
+				['table', 'table.desc', 'mceInsertTable', true],
+				['delete_table', 'table.del', 'mceTableDelete'],
+				['delete_col', 'table.delete_col_desc', 'mceTableDeleteCol'],
+				['delete_row', 'table.delete_row_desc', 'mceTableDeleteRow'],
+				['col_after', 'table.col_after_desc', 'mceTableInsertColAfter'],
+				['col_before', 'table.col_before_desc', 'mceTableInsertColBefore'],
+				['row_after', 'table.row_after_desc', 'mceTableInsertRowAfter'],
+				['row_before', 'table.row_before_desc', 'mceTableInsertRowBefore'],
+				['row_props', 'table.row_desc', 'mceTableRowProps', true],
+				['cell_props', 'table.cell_desc', 'mceTableCellProps', true],
+				['split_cells', 'table.split_cells_desc', 'mceTableSplitCells', true],
+				['merge_cells', 'table.merge_cells_desc', 'mceTableMergeCells', true]
+			], function(c) {
+				ed.addButton(c[0], {title : c[1], cmd : c[2], ui : c[3]});
+			});
+
+			// Select whole table is a table border is clicked
+			if (!tinymce.isIE) {
+				ed.onClick.add(function(ed, e) {
+					e = e.target;
+
+					if (e.nodeName === 'TABLE') {
+						ed.selection.select(e);
+						ed.nodeChanged();
+					}
+				});
+			}
 
-							trElm.insertBefore(newTD, nextElm(tdElm, "TD"));
+			ed.onPreProcess.add(function(ed, args) {
+				var nodes, i, node, dom = ed.dom, value;
 
-							if (rowspan > 1)
-								addRows(newTD, trElm, rowspan);
-						}
+				nodes = dom.select('table', args.node);
+				i = nodes.length;
+				while (i--) {
+					node = nodes[i];
+					dom.setAttrib(node, 'data-mce-style', '');
 
-						addRows(tdElm, trElm, rowspan);
+					if ((value = dom.getAttrib(node, 'width'))) {
+						dom.setStyle(node, 'width', value);
+						dom.setAttrib(node, 'width', '');
 					}
 
-					// Apply visual aids
-					tableElm = tinyMCE.getParentElement(inst.getFocusElement(), "table");
-					break;
+					if ((value = dom.getAttrib(node, 'height'))) {
+						dom.setStyle(node, 'height', value);
+						dom.setAttrib(node, 'height', '');
+					}
+				}
+			});
+
+			// Handle node change updates
+			ed.onNodeChange.add(function(ed, cm, n) {
+				var p;
+
+				n = ed.selection.getStart();
+				p = ed.dom.getParent(n, 'td,th,caption');
+				cm.setActive('table', n.nodeName === 'TABLE' || !!p);
+
+				// Disable table tools if we are in caption
+				if (p && p.nodeName === 'CAPTION')
+					p = 0;
+
+				cm.setDisabled('delete_table', !p);
+				cm.setDisabled('delete_col', !p);
+				cm.setDisabled('delete_table', !p);
+				cm.setDisabled('delete_row', !p);
+				cm.setDisabled('col_after', !p);
+				cm.setDisabled('col_before', !p);
+				cm.setDisabled('row_after', !p);
+				cm.setDisabled('row_before', !p);
+				cm.setDisabled('row_props', !p);
+				cm.setDisabled('cell_props', !p);
+				cm.setDisabled('split_cells', !p);
+				cm.setDisabled('merge_cells', !p);
+			});
+
+			ed.onInit.add(function(ed) {
+				var startTable, startCell, dom = ed.dom, tableGrid;
+
+				winMan = ed.windowManager;
+
+				// Add cell selection logic
+				ed.onMouseDown.add(function(ed, e) {
+					if (e.button != 2) {
+						cleanup();
+
+						startCell = dom.getParent(e.target, 'td,th');
+						startTable = dom.getParent(startCell, 'table');
+					}
+				});
 
-				case "mceTableMergeCells":
-					var rows = new Array();
-					var sel = inst.getSel();
-					var grid = getTableGrid(tableElm);
+				dom.bind(ed.getDoc(), 'mouseover', function(e) {
+					var sel, table, target = e.target;
 
-					if (tinyMCE.isMSIE || sel.rangeCount == 1) {
-						if (user_interface) {
-							// Setup template
-							var template = new Array();
-							var sp = getColRowSpan(tdElm);
+					if (startCell && (tableGrid || target != startCell) && (target.nodeName == 'TD' || target.nodeName == 'TH')) {
+						table = dom.getParent(target, 'table');
+						if (table == startTable) {
+							if (!tableGrid) {
+								tableGrid = createTableGrid(table);
+								tableGrid.setStartCell(startCell);
 
-							template['file'] = '../../plugins/table/merge_cells.htm';
-							template['width'] = 250;
-							template['height'] = 105;
+								ed.getBody().style.webkitUserSelect = 'none';
+							}
 
-							// Language specific width and height addons
-							template['width'] += tinyMCE.getLang('lang_table_merge_cells_delta_width', 0);
-							template['height'] += tinyMCE.getLang('lang_table_merge_cells_height', 0);
+							tableGrid.setEndCell(target);
+							hasCellSelection = true;
+						}
 
-							// Open window
-							tinyMCE.openWindow(template, {editor_id : inst.editorId, inline : "yes", action : "update", numcols : sp.colspan, numrows : sp.rowspan});
+						// Remove current selection
+						sel = ed.selection.getSel();
 
-							return true;
-						} else {
-							var numRows = parseInt(value['numrows']);
-							var numCols = parseInt(value['numcols']);
-							var cpos = getCellPos(grid, tdElm);
+						try {
+							if (sel.removeAllRanges)
+								sel.removeAllRanges();
+							else
+								sel.empty();
+						} catch (ex) {
+							// IE9 might throw errors here
+						}
 
-							if (("" + numRows) == "NaN")
-								numRows = 1;
+						e.preventDefault();
+					}
+				});
 
-							if (("" + numCols) == "NaN")
-								numCols = 1;
+				ed.onMouseUp.add(function(ed, e) {
+					var rng, sel = ed.selection, selectedCells, nativeSel = sel.getSel(), walker, node, lastNode, endNode;
 
-							// Get rows and cells
-							var tRows = tableElm.rows;
-							for (var y=cpos.rowindex; y<grid.length; y++) {
-								var rowCells = new Array();
+					// Move selection to startCell
+					if (startCell) {
+						if (tableGrid)
+							ed.getBody().style.webkitUserSelect = '';
 
-								for (var x=cpos.cellindex; x<grid[y].length; x++) {
-									var td = getCell(grid, y, x);
+						function setPoint(node, start) {
+							var walker = new tinymce.dom.TreeWalker(node, node);
 
-									if (td && !inArray(rows, td) && !inArray(rowCells, td)) {
-										var cp = getCellPos(grid, td);
+							do {
+								// Text node
+								if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {
+									if (start)
+										rng.setStart(node, 0);
+									else
+										rng.setEnd(node, node.nodeValue.length);
 
-										// Within range
-										if (cp.cellindex < cpos.cellindex+numCols && cp.rowindex < cpos.rowindex+numRows)
-											rowCells[rowCells.length] = td;
-									}
+									return;
 								}
 
-								if (rowCells.length > 0)
-									rows[rows.length] = rowCells;
-							}
+								// BR element
+								if (node.nodeName == 'BR') {
+									if (start)
+										rng.setStartBefore(node);
+									else
+										rng.setEndBefore(node);
 
-							//return true;
-						}
-					} else {
-						var cells = new Array();
-						var sel = inst.getSel();
-						var lastTR = null;
-						var curRow = null;
-						var x1 = -1, y1 = -1, x2, y2;
-
-						// Only one cell selected, whats the point?
-						if (sel.rangeCount < 2)
-							return true;
-
-						// Get all selected cells
-						for (var i=0; i<sel.rangeCount; i++) {
-							var rng = sel.getRangeAt(i);
-							var tdElm = rng.startContainer.childNodes[rng.startOffset];
-
-							if (!tdElm)
-								break;
-
-							if (tdElm.nodeName == "TD")
-								cells[cells.length] = tdElm;
+									return;
+								}
+							} while (node = (start ? walker.next() : walker.prev()));
 						}
 
-						// Get rows and cells
-						var tRows = tableElm.rows;
-						for (var y=0; y<tRows.length; y++) {
-							var rowCells = new Array();
+						// Try to expand text selection as much as we can only Gecko supports cell selection
+						selectedCells = dom.select('td.mceSelected,th.mceSelected');
+						if (selectedCells.length > 0) {
+							rng = dom.createRng();
+							node = selectedCells[0];
+							endNode = selectedCells[selectedCells.length - 1];
+							rng.setStartBefore(node);
+							rng.setEndAfter(node);
 
-							for (var x=0; x<tRows[y].cells.length; x++) {
-								var td = tRows[y].cells[x];
+							setPoint(node, 1);
+							walker = new tinymce.dom.TreeWalker(node, dom.getParent(selectedCells[0], 'table'));
 
-								for (var i=0; i<cells.length; i++) {
-									if (td == cells[i]) {
-										rowCells[rowCells.length] = td;
-									}
+							do {
+								if (node.nodeName == 'TD' || node.nodeName == 'TH') {
+									if (!dom.hasClass(node, 'mceSelected'))
+										break;
+
+									lastNode = node;
 								}
-							}
+							} while (node = walker.next());
 
-							if (rowCells.length > 0)
-								rows[rows.length] = rowCells;
-						}
+							setPoint(lastNode);
 
-						// Find selected cells in grid and box
-						var curRow = new Array();
-						var lastTR = null;
-						for (var y=0; y<grid.length; y++) {
-							for (var x=0; x<grid[y].length; x++) {
-								grid[y][x]._selected = false;
-
-								for (var i=0; i<cells.length; i++) {
-									if (grid[y][x] == cells[i]) {
-										// Get start pos
-										if (x1 == -1) {
-											x1 = x;
-											y1 = y;
-										}
-
-										// Get end pos
-										x2 = x;
-										y2 = y;
-
-										grid[y][x]._selected = true;
-									}
-								}
-							}
+							sel.setRng(rng);
 						}
 
-						// Is there gaps, if so deny
-						for (var y=y1; y<=y2; y++) {
-							for (var x=x1; x<=x2; x++) {
-								if (!grid[y][x]._selected) {
-									alert("Invalid selection for merge.");
-									return true;
-								}
-							}
-						}
+						ed.nodeChanged();
+						startCell = tableGrid = startTable = null;
 					}
+				});
 
-					// Validate selection and get total rowspan and colspan
-					var rowSpan = 1, colSpan = 1;
+				ed.onKeyUp.add(function(ed, e) {
+					cleanup();
+				});
 
-					// Validate horizontal and get total colspan
-					var lastRowSpan = -1;
-					for (var y=0; y<rows.length; y++) {
-						var rowColSpan = 0;
+				ed.onKeyDown.add(function (ed, e) {
+					fixTableCellSelection(ed);
+				});
 
-						for (var x=0; x<rows[y].length; x++) {
-							var sd = getColRowSpan(rows[y][x]);
+				ed.onMouseDown.add(function (ed, e) {
+					if (e.button != 2) {
+						fixTableCellSelection(ed);
+					}
+				});
+				function tableCellSelected(ed, rng, n, currentCell) {
+					// The decision of when a table cell is selected is somewhat involved.  The fact that this code is
+					// required is actually a pointer to the root cause of this bug. A cell is selected when the start 
+					// and end offsets are 0, the start container is a text, and the selection node is either a TR (most cases)
+					// or the parent of the table (in the case of the selection containing the last cell of a table).
+					var TEXT_NODE = 3, table = ed.dom.getParent(rng.startContainer, 'TABLE'), 
+					tableParent, allOfCellSelected, tableCellSelection;
+					if (table) 
+					tableParent = table.parentNode;
+					allOfCellSelected =rng.startContainer.nodeType == TEXT_NODE && 
+						rng.startOffset == 0 && 
+						rng.endOffset == 0 && 
+						currentCell && 
+						(n.nodeName=="TR" || n==tableParent);
+					tableCellSelection = (n.nodeName=="TD"||n.nodeName=="TH")&& !currentCell;       
+					return  allOfCellSelected || tableCellSelection;
+					// return false;
+				}
+				
+				// this nasty hack is here to work around some WebKit selection bugs.
+				function fixTableCellSelection(ed) {
+					if (!tinymce.isWebKit)
+						return;
+
+					var rng = ed.selection.getRng();
+					var n = ed.selection.getNode();
+					var currentCell = ed.dom.getParent(rng.startContainer, 'TD');
+				
+					if (!tableCellSelected(ed, rng, n, currentCell))
+						return;
+						if (!currentCell) {
+							currentCell=n;
+						}
+					
+					// Get the very last node inside the table cell
+					var end = currentCell.lastChild;
+					while (end.lastChild)
+						end = end.lastChild;
+                    
+					// Select the entire table cell. Nothing outside of the table cell should be selected.
+					rng.setEnd(end, end.nodeValue.length);
+					ed.selection.setRng(rng);
+				}
+				ed.plugins.table.fixTableCellSelection=fixTableCellSelection;
 
-							rowColSpan += sd['colspan'];
+				// Add context menu
+				if (ed && ed.plugins.contextmenu) {
+					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {
+						var sm, se = ed.selection, el = se.getNode() || ed.getBody();
 
-							if (lastRowSpan != -1 && sd['rowspan'] != lastRowSpan) {
-								alert("Invalid selection for merge.");
-								return true;
+						if (ed.dom.getParent(e, 'td') || ed.dom.getParent(e, 'th') || ed.dom.select('td.mceSelected,th.mceSelected').length) {
+							m.removeAll();
+
+							if (el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) {
+								m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});
+								m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});
+								m.addSeparator();
 							}
 
-							lastRowSpan = sd['rowspan'];
-						}
+							if (el.nodeName == 'IMG' && el.className.indexOf('mceItem') == -1) {
+								m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});
+								m.addSeparator();
+							}
 
-						if (rowColSpan > colSpan)
-							colSpan = rowColSpan;
+							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', value : {action : 'insert'}});
+							m.add({title : 'table.props_desc', icon : 'table_props', cmd : 'mceInsertTable'});
+							m.add({title : 'table.del', icon : 'delete_table', cmd : 'mceTableDelete'});
+							m.addSeparator();
+
+							// Cell menu
+							sm = m.addMenu({title : 'table.cell'});
+							sm.add({title : 'table.cell_desc', icon : 'cell_props', cmd : 'mceTableCellProps'});
+							sm.add({title : 'table.split_cells_desc', icon : 'split_cells', cmd : 'mceTableSplitCells'});
+							sm.add({title : 'table.merge_cells_desc', icon : 'merge_cells', cmd : 'mceTableMergeCells'});
+
+							// Row menu
+							sm = m.addMenu({title : 'table.row'});
+							sm.add({title : 'table.row_desc', icon : 'row_props', cmd : 'mceTableRowProps'});
+							sm.add({title : 'table.row_before_desc', icon : 'row_before', cmd : 'mceTableInsertRowBefore'});
+							sm.add({title : 'table.row_after_desc', icon : 'row_after', cmd : 'mceTableInsertRowAfter'});
+							sm.add({title : 'table.delete_row_desc', icon : 'delete_row', cmd : 'mceTableDeleteRow'});
+							sm.addSeparator();
+							sm.add({title : 'table.cut_row_desc', icon : 'cut', cmd : 'mceTableCutRow'});
+							sm.add({title : 'table.copy_row_desc', icon : 'copy', cmd : 'mceTableCopyRow'});
+							sm.add({title : 'table.paste_row_before_desc', icon : 'paste', cmd : 'mceTablePasteRowBefore'}).setDisabled(!clipboardRows);
+							sm.add({title : 'table.paste_row_after_desc', icon : 'paste', cmd : 'mceTablePasteRowAfter'}).setDisabled(!clipboardRows);
+
+							// Column menu
+							sm = m.addMenu({title : 'table.col'});
+							sm.add({title : 'table.col_before_desc', icon : 'col_before', cmd : 'mceTableInsertColBefore'});
+							sm.add({title : 'table.col_after_desc', icon : 'col_after', cmd : 'mceTableInsertColAfter'});
+							sm.add({title : 'table.delete_col_desc', icon : 'delete_col', cmd : 'mceTableDeleteCol'});
+						} else
+							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable'});
+					});
+				}
 
-						lastRowSpan = -1;
-					}
+				// Fix to allow navigating up and down in a table in WebKit browsers.
+				if (tinymce.isWebKit) {
+					function moveSelection(ed, e) {
 
-					// Validate vertical and get total rowspan
-					var lastColSpan = -1;
-					for (var x=0; x<rows[0].length; x++) {
-						var colRowSpan = 0;
+						function moveCursorToStartOfElement(n) {
+							ed.selection.setCursorLocation(n, 0);
+						}
 
-						for (var y=0; y<rows.length; y++) {
-							var sd = getColRowSpan(rows[y][x]);
+						function getSibling(event, element) {
+							return event.keyCode == UP_ARROW ? element.previousSibling : element.nextSibling;
+						}
 
-							colRowSpan += sd['rowspan'];
+						function getNextRow(e, row) {
+							var sibling = getSibling(e, row);
+							return sibling !== null && sibling.tagName === 'TR' ? sibling : null;
+						}
 
-							if (lastColSpan != -1 && sd['colspan'] != lastColSpan) {
-								alert("Invalid selection for merge.");
-								return true;
-							}
+						function getTable(ed, currentRow) {
+							return ed.dom.getParent(currentRow, 'table');
+						}
 
-							lastColSpan = sd['colspan'];
+						function getTableSibling(currentRow) {
+							var table = getTable(ed, currentRow);
+							return getSibling(e, table);
 						}
 
-						if (colRowSpan > rowSpan)
-							rowSpan = colRowSpan;
+						function isVerticalMovement(event) {
+							return event.keyCode == UP_ARROW || event.keyCode == DOWN_ARROW;
+						}
 
-						lastColSpan = -1;
-					}
+						function isInTable(ed) {
+							var node = ed.selection.getNode();
+							var currentRow = ed.dom.getParent(node, 'tr');
+							return currentRow !== null;
+						}
 
-					// Setup td
-					tdElm = rows[0][0];
-					tdElm.rowSpan = rowSpan;
-					tdElm.colSpan = colSpan;
+						function columnIndex(column) {
+							var colIndex = 0;
+							var c = column;
+							while (c.previousSibling) {
+								c = c.previousSibling;
+								colIndex = colIndex + getSpanVal(c, "colspan");
+							}
+							return colIndex;
+						}
 
-					// Merge cells
-					for (var y=0; y<rows.length; y++) {
-						for (var x=0; x<rows[y].length; x++) {
-							var html = rows[y][x].innerHTML;
-							var chk = tinyMCE.regexpReplace(html, "[ \t\r\n]", "");
+						function findColumn(rowElement, columnIndex) {
+							var c = 0;
+							var r = 0;
+							each(rowElement.children, function(cell, i) {
+								c = c + getSpanVal(cell, "colspan");
+								r = i;
+								if (c > columnIndex)
+									return false;
+							});
+							return r;
+						}
 
-							if (chk != "<br/>" && chk != "<br>" && chk != "&nbsp;" && (x+y > 0))
-								tdElm.innerHTML += html;
+						function moveCursorToRow(ed, node, row) {
+							var srcColumnIndex = columnIndex(ed.dom.getParent(node, 'td,th'));
+							var tgtColumnIndex = findColumn(row, srcColumnIndex)
+							var tgtNode = row.childNodes[tgtColumnIndex];
+							moveCursorToStartOfElement(tgtNode);
+						}
 
-							// Not current cell
-							if (rows[y][x] != tdElm && !rows[y][x]._deleted) {
-								var cpos = getCellPos(grid, rows[y][x]);
-								var tr = rows[y][x].parentNode;
+						function escapeTable(currentRow, e) {
+							var tableSiblingElement = getTableSibling(currentRow);
+							if (tableSiblingElement !== null) {
+								moveCursorToStartOfElement(tableSiblingElement);
+								return tinymce.dom.Event.cancel(e);
+							} else {
+								var element = e.keyCode == UP_ARROW ? currentRow.firstChild : currentRow.lastChild;
+								// rely on default behaviour to escape table after we are in the last cell of the last row
+								moveCursorToStartOfElement(element);
+								return true;
+							}
+						}
 
-								tr.removeChild(rows[y][x]);
-								rows[y][x]._deleted = true;
+						var UP_ARROW = 38;
+						var DOWN_ARROW = 40;
 
-								// Empty TR, remove it
-								if (!tr.hasChildNodes()) {
-									tr.parentNode.removeChild(tr);
+						if (isVerticalMovement(e) && isInTable(ed)) {
+							var node = ed.selection.getNode();
+							var currentRow = ed.dom.getParent(node, 'tr');
+							var nextRow = getNextRow(e, currentRow);
 
-									var lastCell = null;
-									for (var x=0; cellElm = getCell(grid, cpos.rowindex, x); x++) {
-										if (cellElm != lastCell && cellElm.rowSpan > 1)
-											cellElm.rowSpan--;
+							// If we're at the first or last row in the table, we should move the caret outside of the table
+							if (nextRow == null) {
+								return escapeTable(currentRow, e);
+							} else {
+								moveCursorToRow(ed, node, nextRow);
+								tinymce.dom.Event.cancel(e);
+								return true;
+							}
+						}
+					}
 
-										lastCell = cellElm;
+					ed.onKeyDown.add(moveSelection);
+				}
+								
+				// Fixes an issue on Gecko where it's impossible to place the caret behind a table
+				// This fix will force a paragraph element after the table but only when the forced_root_block setting is enabled
+				if (!tinymce.isIE) {
+					function fixTableCaretPos() {
+						var last;
+
+						// Skip empty text nodes form the end
+						for (last = ed.getBody().lastChild; last && last.nodeType == 3 && !last.nodeValue.length; last = last.previousSibling) ;
+
+						if (last && last.nodeName == 'TABLE')
+							ed.dom.add(ed.getBody(), 'p', null, '<br mce_bogus="1" />');
+					};
+
+					// Fixes an bug where it's impossible to place the caret before a table in Gecko
+					// this fix solves it by detecting when the caret is at the beginning of such a table
+					// and then manually moves the caret infront of the table
+					if (tinymce.isGecko) {
+						ed.onKeyDown.add(function(ed, e) {
+							var rng, table, dom = ed.dom;
+
+							// On gecko it's not possible to place the caret before a table
+							if (e.keyCode == 37 || e.keyCode == 38) {
+								rng = ed.selection.getRng();
+								table = dom.getParent(rng.startContainer, 'table');
+
+								if (table && ed.getBody().firstChild == table) {
+									if (isAtStart(rng, table)) {
+										rng = dom.createRng();
+
+										rng.setStartBefore(table);
+										rng.setEndBefore(table);
+
+										ed.selection.setRng(rng);
+
+										e.preventDefault();
 									}
-
-									if (tdElm.rowSpan > 1)
-										tdElm.rowSpan--;
 								}
 							}
-						}
+						});
 					}
 
-					break;
+					ed.onKeyUp.add(fixTableCaretPos);
+					ed.onSetContent.add(fixTableCaretPos);
+					ed.onVisualAid.add(fixTableCaretPos);
+
+					ed.onPreProcess.add(function(ed, o) {
+						var last = o.node.lastChild;
+
+						if (last && last.childNodes.length == 1 && last.firstChild.nodeName == 'BR')
+							ed.dom.remove(last);
+					});
+
+					fixTableCaretPos();
+					ed.startContent = ed.getContent({format : 'raw'});
 				}
+			});
 
-				tableElm = tinyMCE.getParentElement(inst.getFocusElement(), "table");
-				tinyMCE.handleVisualAid(tableElm, true, tinyMCE.settings['visual'], tinyMCE.selectedInstance);
-				tinyMCE.triggerNodeChange();
-				inst.repaint();
-			}
+			// Register action commands
+			each({
+				mceTableSplitCells : function(grid) {
+					grid.split();
+				},
 
-		return true;
-	}
+				mceTableMergeCells : function(grid) {
+					var rowSpan, colSpan, cell;
 
-	// Pass to next handler in chain
-	return false;
-}
-
-function TinyMCE_table_handleNodeChange(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
-	var colspan = "1", rowspan = "1";
-
-	var inst = tinyMCE.getInstanceById(editor_id);
-
-	// Reset table controls
-	tinyMCE.switchClassSticky(editor_id + '_table', 'mceButtonNormal');
-	tinyMCE.switchClassSticky(editor_id + '_row_props', 'mceButtonDisabled', true);
-	tinyMCE.switchClassSticky(editor_id + '_cell_props', 'mceButtonDisabled', true);
-	tinyMCE.switchClassSticky(editor_id + '_row_before', 'mceButtonDisabled', true);
-	tinyMCE.switchClassSticky(editor_id + '_row_after', 'mceButtonDisabled', true);
-	tinyMCE.switchClassSticky(editor_id + '_delete_row', 'mceButtonDisabled', true);
-	tinyMCE.switchClassSticky(editor_id + '_col_before', 'mceButtonDisabled', true);
-	tinyMCE.switchClassSticky(editor_id + '_col_after', 'mceButtonDisabled', true);
-	tinyMCE.switchClassSticky(editor_id + '_delete_col', 'mceButtonDisabled', true);
-	tinyMCE.switchClassSticky(editor_id + '_split_cells', 'mceButtonDisabled', true);
-	tinyMCE.switchClassSticky(editor_id + '_merge_cells', 'mceButtonDisabled', true);
-
-	// Within a tr element
-	if (tinyMCE.getParentElement(node, "tr"))
-		tinyMCE.switchClassSticky(editor_id + '_row_props', 'mceButtonSelected', false);
-
-	// Within a td element
-	if (tdElm = tinyMCE.getParentElement(node, "td,th")) {
-		tinyMCE.switchClassSticky(editor_id + '_cell_props', 'mceButtonSelected', false);
-		tinyMCE.switchClassSticky(editor_id + '_row_before', 'mceButtonNormal', false);
-		tinyMCE.switchClassSticky(editor_id + '_row_after', 'mceButtonNormal', false);
-		tinyMCE.switchClassSticky(editor_id + '_delete_row', 'mceButtonNormal', false);
-		tinyMCE.switchClassSticky(editor_id + '_col_before', 'mceButtonNormal', false);
-		tinyMCE.switchClassSticky(editor_id + '_col_after', 'mceButtonNormal', false);
-		tinyMCE.switchClassSticky(editor_id + '_delete_col', 'mceButtonNormal', false);
-
-		colspan = tinyMCE.getAttrib(tdElm, "colspan");
-		rowspan = tinyMCE.getAttrib(tdElm, "rowspan");
-
-		colspan = colspan == "" ? "1" : colspan;
-		rowspan = rowspan == "" ? "1" : rowspan;
-
-		if (colspan != "1" || rowspan != "1")
-			tinyMCE.switchClassSticky(editor_id + '_split_cells', 'mceButtonNormal', false);
-	}
+					cell = ed.dom.getParent(ed.selection.getNode(), 'th,td');
+					if (cell) {
+						rowSpan = cell.rowSpan;
+						colSpan = cell.colSpan;
+					}
 
-	// Within table
-	if (tinyMCE.getParentElement(node, "table")) {
-		tinyMCE.switchClassSticky(editor_id + '_table', 'mceButtonSelected');
-		tinyMCE.switchClassSticky(editor_id + '_merge_cells', 'mceButtonNormal', false);
-	}
-}
+					if (!ed.dom.select('td.mceSelected,th.mceSelected').length) {
+						winMan.open({
+							url : url + '/merge_cells.htm',
+							width : 240 + parseInt(ed.getLang('table.merge_cells_delta_width', 0)),
+							height : 110 + parseInt(ed.getLang('table.merge_cells_delta_height', 0)),
+							inline : 1
+						}, {
+							rows : rowSpan,
+							cols : colSpan,
+							onaction : function(data) {
+								grid.merge(cell, data.cols, data.rows);
+							},
+							plugin_url : url
+						});
+					} else
+						grid.merge();
+				},
+
+				mceTableInsertRowBefore : function(grid) {
+					grid.insertRow(true);
+				},
+
+				mceTableInsertRowAfter : function(grid) {
+					grid.insertRow();
+				},
+
+				mceTableInsertColBefore : function(grid) {
+					grid.insertCol(true);
+				},
+
+				mceTableInsertColAfter : function(grid) {
+					grid.insertCol();
+				},
+
+				mceTableDeleteCol : function(grid) {
+					grid.deleteCols();
+				},
+
+				mceTableDeleteRow : function(grid) {
+					grid.deleteRows();
+				},
+
+				mceTableCutRow : function(grid) {
+					clipboardRows = grid.cutRows();
+				},
+
+				mceTableCopyRow : function(grid) {
+					clipboardRows = grid.copyRows();
+				},
+
+				mceTablePasteRowBefore : function(grid) {
+					grid.pasteRows(clipboardRows, true);
+				},
+
+				mceTablePasteRowAfter : function(grid) {
+					grid.pasteRows(clipboardRows);
+				},
+
+				mceTableDelete : function(grid) {
+					grid.deleteTable();
+				}
+			}, function(func, name) {
+				ed.addCommand(name, function() {
+					var grid = createTableGrid();
+
+					if (grid) {
+						func(grid);
+						ed.execCommand('mceRepaint');
+						cleanup();
+					}
+				});
+			});
+
+			// Register dialog commands
+			each({
+				mceInsertTable : function(val) {
+					winMan.open({
+						url : url + '/table.htm',
+						width : 400 + parseInt(ed.getLang('table.table_delta_width', 0)),
+						height : 320 + parseInt(ed.getLang('table.table_delta_height', 0)),
+						inline : 1
+					}, {
+						plugin_url : url,
+						action : val ? val.action : 0
+					});
+				},
+
+				mceTableRowProps : function() {
+					winMan.open({
+						url : url + '/row.htm',
+						width : 400 + parseInt(ed.getLang('table.rowprops_delta_width', 0)),
+						height : 295 + parseInt(ed.getLang('table.rowprops_delta_height', 0)),
+						inline : 1
+					}, {
+						plugin_url : url
+					});
+				},
+
+				mceTableCellProps : function() {
+					winMan.open({
+						url : url + '/cell.htm',
+						width : 400 + parseInt(ed.getLang('table.cellprops_delta_width', 0)),
+						height : 295 + parseInt(ed.getLang('table.cellprops_delta_height', 0)),
+						inline : 1
+					}, {
+						plugin_url : url
+					});
+				}
+			}, function(func, name) {
+				ed.addCommand(name, function(ui, val) {
+					func(val);
+				});
+			});
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('table', tinymce.plugins.TablePlugin);
+})(tinymce);