From 94dfd8ab9d61a969453fdd3b9be14b58e1576816 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sun, 27 Mar 2011 11:14:12 -0400
Subject: [PATCH] - TinyMCE 3.4.1
---
program/js/tiny_mce/plugins/table/editor_plugin_src.js | 129 +++++++++++++++++++++++++++++++++---------
1 files changed, 101 insertions(+), 28 deletions(-)
diff --git a/program/js/tiny_mce/plugins/table/editor_plugin_src.js b/program/js/tiny_mce/plugins/table/editor_plugin_src.js
index c2f307f..7bfe273 100644
--- a/program/js/tiny_mce/plugins/table/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/table/editor_plugin_src.js
@@ -11,6 +11,20 @@
(function(tinymce) {
var each = tinymce.each;
+ // 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;
+
+ rng2.setStartBefore(par);
+ rng2.setEnd(rng.endContainer, rng.endOffset);
+
+ elm = doc.createElement('body');
+ elm.appendChild(rng2.cloneContents());
+
+ // 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;
+ };
+
/**
* Table Grid class.
*/
@@ -38,12 +52,12 @@
grid = [];
each(['thead', 'tbody', 'tfoot'], function(part) {
- var rows = dom.select(part + ' tr', table);
+ var rows = dom.select('> ' + part + ' tr', table);
each(rows, function(tr, y) {
y += startY;
- each(dom.select('td,th', tr), function(td, x) {
+ each(dom.select('> td, > th', tr), function(td, x) {
var x2, y2, rowspan, colspan;
// Skip over existing cells produced by rowspan
@@ -90,8 +104,19 @@
return parseInt(td.getAttribute(name) || 1);
};
+ function setSpanVal(td, name, val) {
+ if (td) {
+ val = parseInt(val);
+
+ if (val === 1)
+ td.removeAttribute(name, 1);
+ else
+ td.setAttribute(name, val, 1);
+ }
+ }
+
function isCellSelected(cell) {
- return dom.hasClass(cell.elm, 'mceSelected') || cell == selectedCell;
+ return cell && (dom.hasClass(cell.elm, 'mceSelected') || cell == selectedCell);
};
function getSelectedRows() {
@@ -141,20 +166,21 @@
// Add something to the inner node
if (curNode)
- curNode.innerHTML = tinymce.isIE ? ' ' : '<br _mce_bogus="1" />';
+ curNode.innerHTML = tinymce.isIE ? ' ' : '<br data-mce-bogus="1" />';
return false;
}
}, 'childNodes');
cell = cloneNode(cell, false);
- cell.rowSpan = cell.colSpan = 1;
+ setSpanVal(cell, 'rowspan', 1);
+ setSpanVal(cell, 'colspan', 1);
if (formatNode) {
cell.appendChild(formatNode);
} else {
if (!tinymce.isIE)
- cell.innerHTML = '<br _mce_bogus="1" />';
+ cell.innerHTML = '<br data-mce-bogus="1" />';
}
return cell;
@@ -236,7 +262,8 @@
rowSpan = getSpanVal(cell, 'rowspan');
if (colSpan > 1 || rowSpan > 1) {
- cell.colSpan = cell.rowSpan = 1;
+ setSpanVal(cell, 'rowspan', 1);
+ setSpanVal(cell, 'colspan', 1);
// Insert cells right
for (i = 0; i < colSpan - 1; i++)
@@ -250,7 +277,7 @@
};
function merge(cell, cols, rows) {
- var startX, startY, endX, endY, x, y, startCell, endCell, cell, children;
+ var startX, startY, endX, endY, x, y, startCell, endCell, cell, children, count;
// Use specified cell and cols/rows
if (cell) {
@@ -279,23 +306,34 @@
// Set row/col span to start cell
startCell = getCell(startX, startY).elm;
- startCell.colSpan = (endX - startX) + 1;
- startCell.rowSpan = (endY - startY) + 1;
+ 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, i) {
- // Jump over last BR element
- if (node.nodeName != 'BR' || i != children.length - 1)
- startCell.appendChild(node);
+ 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);
}
@@ -308,7 +346,7 @@
};
function insertRow(before) {
- var posY, cell, lastCell, x, rowElm, newRow, newCell, otherCell;
+ var posY, cell, lastCell, x, rowElm, newRow, newCell, otherCell, rowSpan;
// Find first/last row
each(grid, function(row, y) {
@@ -329,13 +367,17 @@
});
for (x = 0; x < grid[0].length; x++) {
+ // Cell not found could be because of an invalid table structure
+ if (!grid[posY][x])
+ continue;
+
cell = grid[posY][x].elm;
if (cell != lastCell) {
if (!before) {
rowSpan = getSpanVal(cell, 'rowspan');
if (rowSpan > 1) {
- cell.rowSpan = rowSpan + 1;
+ setSpanVal(cell, 'rowspan', rowSpan + 1);
continue;
}
} else {
@@ -344,15 +386,16 @@
otherCell = grid[posY - 1][x].elm;
rowSpan = getSpanVal(otherCell, 'rowspan');
if (rowSpan > 1) {
- otherCell.rowSpan = rowSpan + 1;
+ setSpanVal(otherCell, 'rowspan', rowSpan + 1);
continue;
}
}
}
// Insert new cell into new row
- newCell = cloneCell(cell)
- newCell.colSpan = cell.colSpan;
+ newCell = cloneCell(cell);
+ setSpanVal(newCell, 'colspan', cell.colSpan);
+
newRow.appendChild(newCell);
lastCell = cell;
@@ -386,8 +429,12 @@
});
each(grid, function(row, y) {
- var cell = row[posX].elm, rowSpan, colSpan;
+ var cell, rowSpan, colSpan;
+ if (!row[posX])
+ return;
+
+ cell = row[posX].elm;
if (cell != lastCell) {
colSpan = getSpanVal(cell, 'colspan');
rowSpan = getSpanVal(cell, 'rowspan');
@@ -401,7 +448,7 @@
fillLeftDown(posX, y, rowSpan - 1, colSpan);
}
} else
- cell.colSpan++;
+ setSpanVal(cell, 'colspan', cell.colSpan + 1);
lastCell = cell;
}
@@ -421,7 +468,7 @@
colSpan = getSpanVal(cell, 'colspan');
if (colSpan > 1)
- cell.colSpan = colSpan - 1;
+ setSpanVal(cell, 'colspan', colSpan - 1);
else
dom.remove(cell);
});
@@ -447,7 +494,7 @@
var rowSpan = getSpanVal(cell, 'rowspan');
if (rowSpan > 1) {
- cell.rowSpan = rowSpan - 1;
+ setSpanVal(cell, 'rowspan', rowSpan - 1);
pos = getPos(cell);
fillLeftDown(pos.x, pos.y, 1, 1);
}
@@ -466,7 +513,7 @@
if (rowSpan <= 1)
dom.remove(cell);
else
- cell.rowSpan = rowSpan - 1;
+ setSpanVal(cell, 'rowspan', rowSpan - 1);
lastCell = cell;
}
@@ -534,7 +581,8 @@
// Remove col/rowspans
for (i = 0; i < cellCount; i++) {
cell = row.cells[i];
- cell.colSpan = cell.rowSpan = 1;
+ setSpanVal(cell, 'colspan', 1);
+ setSpanVal(cell, 'rowspan', 1);
}
// Needs more cells
@@ -676,8 +724,10 @@
// Add new selection
for (y = startY; y <= maxY; y++) {
- for (x = startX; x <= maxX; x++)
- dom.addClass(grid[y][x].elm, 'mceSelected');
+ for (x = startX; x <= maxX; x++) {
+ if (grid[y][x])
+ dom.addClass(grid[y][x].elm, 'mceSelected');
+ }
}
}
};
@@ -740,11 +790,34 @@
ed.onClick.add(function(ed, e) {
e = e.target;
- if (e.nodeName === 'TABLE')
+ if (e.nodeName === 'TABLE') {
ed.selection.select(e);
+ ed.nodeChanged();
+ }
});
}
+ ed.onPreProcess.add(function(ed, args) {
+ var nodes, i, node, dom = ed.dom, value;
+
+ nodes = dom.select('table', args.node);
+ i = nodes.length;
+ while (i--) {
+ node = nodes[i];
+ dom.setAttrib(node, 'data-mce-style', '');
+
+ if ((value = dom.getAttrib(node, 'width'))) {
+ dom.setStyle(node, 'width', value);
+ dom.setAttrib(node, 'width', '');
+ }
+
+ 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;
--
Gitblit v1.9.1