Project

General

Profile

Bug #23551 » rtehtmlarea_bugfix_15730_typo3_4-3.patch

Administrator Admin, 2010-09-28 07:27

View differences:

typo3/sysext/rtehtmlarea/htmlarea/htmlarea-gecko.js (copie de travail)
}
p = df.firstChild;
if (p) {
if (!/\S/.test(p.innerHTML) || (p.childNodes.length == 1 && /^br$/i.test(p.firstChild.nodeName))) {
if (!/\S/.test(p.innerHTML) || (!/\S/.test(p.textContent) && !/<(img|hr|table)/i.test(p.innerHTML))) {
if (/^h[1-6]$/i.test(p.nodeName)) {
p = this.convertNode(p, "p");
}
......
if (!HTMLArea.is_opera) {
p.innerHTML = "<br />";
}
if(/^li$/i.test(p.nodeName) && left_empty && !block.nextSibling) {
if (/^li$/i.test(p.nodeName) && left_empty && (!block.nextSibling || !/^li$/i.test(block.nextSibling.nodeName))) {
left = block.parentNode;
left.removeChild(block);
range.setEndAfter(left);
......
}
}
range.insertNode(df);
// Remove any anchor created empty
// Remove any anchor created empty on both sides of the selection
if (p.previousSibling) {
var a = p.previousSibling.lastChild;
......
if (a && /^a$/i.test(a.nodeName) && !/\S/.test(a.innerHTML)) {
this.convertNode(a, 'br');
}
// Walk inside the deepest child element (presumably inline element)
while (p.firstChild && p.firstChild.nodeType == 1 && !/^(br|img|hr|table)$/i.test(p.firstChild.nodeName)) {
p = p.firstChild;
}
if (/^br$/i.test(p.nodeName)) {
p = p.parentNode.insertBefore(this._doc.createTextNode("\x20"), p);
p = p.parentNode.insertBefore(doc.createTextNode('\x20'), p);
} else if (!/\S/.test(p.innerHTML)) {
// Need some element inside the deepest element
p.appendChild(doc.createElement('br'));
}
this.selectNodeContents(p, true);
} else {
(2-2/2)