Bug #17660 » rtehtmlarea_bugfix_6476_trunk.patch
| typo3/sysext/rtehtmlarea/htmlarea/htmlarea-gecko.js (working copy) | ||
|---|---|---|
|
*
|
||
|
* (c) 2002-2004, interactivetools.com, inc.
|
||
|
* (c) 2003-2004 dynarch.com
|
||
|
* (c) 2004, 2005, 2006 Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
|
||
|
* (c) 2004-2007 Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
|
||
|
* All rights reserved
|
||
|
*
|
||
|
* This script is part of the TYPO3 project. The TYPO3 project is
|
||
| ... | ... | |
|
/*
|
||
|
* Enter event handler
|
||
|
*/
|
||
|
HTMLArea.prototype._checkInsertP = function() {
|
||
|
HTMLArea.prototype._checkInsertP = function(ev) {
|
||
|
var editor = this;
|
||
|
this.focusEditor();
|
||
|
var i, SC, left, right, r2,
|
||
|
sel = this._getSelection(),
|
||
|
r = this._createRange(sel),
|
||
|
p = this.getAllAncestors(),
|
||
|
block = null,
|
||
|
a = null,
|
||
|
doc = this._doc,
|
||
|
body = doc.body;
|
||
|
var i, left, right, rangeClone,
|
||
|
sel = this._getSelection(),
|
||
|
range = this._createRange(sel),
|
||
|
p = this.getAllAncestors(),
|
||
|
block = null,
|
||
|
a = null,
|
||
|
doc = this._doc;
|
||
|
|
||
|
for (i = 0; i < p.length; ++i) {
|
||
|
if (HTMLArea.isBlockElement(p[i]) && !/html|body|table|tbody|tr/i.test(p[i].tagName)) {
|
||
|
block = p[i];
|
||
|
break;
|
||
|
}
|
||
|
}
|
||
|
if (!r.collapsed) r.deleteContents();
|
||
|
if (!range.collapsed) range.deleteContents();
|
||
|
if (HTMLArea.is_safari) sel.empty();
|
||
|
else sel.removeAllRanges();
|
||
|
SC = r.startContainer;
|
||
|
if (HTMLArea.is_opera && SC.nodeType == 3 && SC.data.length == 0) SC = HTMLArea.getPrevNode(SC);
|
||
|
if (!block || /^(td|div)$/i.test(block.tagName)) {
|
||
|
left = SC;
|
||
|
for (i = SC; i && !HTMLArea.isBlockElement(i); i = HTMLArea.getPrevNode(i)) { left = i; }
|
||
|
right = SC;
|
||
|
if (HTMLArea.is_opera && right.nodeType == 3 && right.data.length == 0) right = HTMLArea.getNextNode(right);
|
||
|
if(left != body && right != body && !(block && left == block ) && !(block && right == block )) {
|
||
|
r2 = r.cloneRange();
|
||
|
if (HTMLArea.is_opera) r2.setStart(left,0);
|
||
|
else r2.setStartBefore(left);
|
||
|
r2.surroundContents(block = doc.createElement('p'));
|
||
|
if (!/\S/.test(HTMLArea.getInnerText(block))) {
|
||
|
// Remove any anchor created empty
|
||
|
a = block.lastChild;
|
||
|
if (a && /^a$/i.test(a.tagName) && !/\S/.test(a.innerHTML)) HTMLArea.removeFromParent(a);
|
||
|
block.appendChild(doc.createElement('br'));
|
||
|
if (!block) var block = doc.body;
|
||
|
if (/\S/.test(HTMLArea.getInnerText(block))) {
|
||
|
rangeClone = range.cloneRange();
|
||
|
rangeClone.setStartBefore(block.firstChild);
|
||
|
rangeClone.surroundContents(left = doc.createElement('p'));
|
||
|
if (!/\S/.test(HTMLArea.getInnerText(left))) {
|
||
|
// Remove any element created empty
|
||
|
a = left.lastChild;
|
||
|
if (a && !/\S/.test(HTMLArea.getInnerText(a))) HTMLArea.removeFromParent(a);
|
||
|
left.appendChild(doc.createElement('br'));
|
||
|
}
|
||
|
block.normalize();
|
||
|
if (HTMLArea.is_opera) {
|
||
|
SC = HTMLArea.getNextNode(block);
|
||
|
for (i = SC; i && !HTMLArea.isBlockElement(i); i = HTMLArea.getNextNode(i)) { right = i; }
|
||
|
r.setStart(SC, 0);
|
||
|
r.setEnd(right, right.length);
|
||
|
} else {
|
||
|
r.setEndAfter(right);
|
||
|
left.normalize();
|
||
|
range.setEndAfter(block.lastChild);
|
||
|
range.surroundContents(right = doc.createElement('p'));
|
||
|
// Remove any element created empty
|
||
|
a = right.previousSibling;
|
||
|
if (a && !/\S/.test(HTMLArea.getInnerText(a))) HTMLArea.removeFromParent(a);
|
||
|
if (!/\S/.test(HTMLArea.getInnerText(right))) {
|
||
|
// Remove any element created empty
|
||
|
a = right.lastChild;
|
||
|
if (a && !/\S/.test(HTMLArea.getInnerText(a))) HTMLArea.removeFromParent(a);
|
||
|
right.appendChild(doc.createElement('br'));
|
||
|
}
|
||
|
r.surroundContents(block = doc.createElement('p'));
|
||
|
// Remove any anchor created empty
|
||
|
a = block.previousSibling;
|
||
|
if (a && /^a$/i.test(a.tagName) && !/\S/.test(a.innerHTML)) HTMLArea.removeFromParent(a);
|
||
|
if (!/\S/.test(HTMLArea.getInnerText(block))) {
|
||
|
// Remove any anchor created empty
|
||
|
a = block.lastChild;
|
||
|
if (a && /^a$/i.test(a.tagName) && !/\S/.test(a.innerHTML)) HTMLArea.removeFromParent(a);
|
||
|
block.appendChild(doc.createElement('br'));
|
||
|
}
|
||
|
block.normalize();
|
||
|
right.normalize();
|
||
|
} else {
|
||
|
if (!block) block = body;
|
||
|
r = doc.createRange();
|
||
|
r.setStart(block, 0);
|
||
|
r.setEnd(block, 0);
|
||
|
r.insertNode(block = doc.createElement('p'));
|
||
|
block.appendChild(doc.createElement('br'));
|
||
|
range = doc.createRange();
|
||
|
var first = block.firstChild;
|
||
|
block.removeChild(first);
|
||
|
block.appendChild(right = doc.createElement('p'));
|
||
|
right.appendChild(first);
|
||
|
}
|
||
|
if (HTMLArea.is_opera) r.selectNode(block);
|
||
|
else r.selectNodeContents(block);
|
||
|
range.selectNodeContents(right);
|
||
|
} else {
|
||
|
if (!HTMLArea.is_opera || /\S/.test(HTMLArea.getInnerText(block))) r.setEndAfter(block);
|
||
|
var df = r.extractContents(), left_empty = false;
|
||
|
range.setEndAfter(block);
|
||
|
var df = range.extractContents(), left_empty = false;
|
||
|
if(!/\S/.test(HTMLArea.getInnerText(block))) {
|
||
|
block.innerHTML = "<br />";
|
||
|
left_empty = true;
|
||
| ... | ... | |
|
if(/^li$/i.test(p.tagName) && left_empty && !block.nextSibling) {
|
||
|
left = block.parentNode;
|
||
|
left.removeChild(block);
|
||
|
r.setEndAfter(left);
|
||
|
r.collapse(false);
|
||
|
range.setEndAfter(left);
|
||
|
range.collapse(false);
|
||
|
p = this.convertNode(p, /^li$/i.test(left.parentNode.tagName) ? "br" : "p");
|
||
|
}
|
||
|
r.insertNode(df);
|
||
|
range.insertNode(df);
|
||
|
// Remove any anchor created empty
|
||
|
var a = p.previousSibling.lastChild;
|
||
|
if (a && /^a$/i.test(a.tagName) && !/\S/.test(a.innerHTML)) HTMLArea.removeFromParent(a);
|
||
|
if (HTMLArea.is_opera) r.selectNode(p);
|
||
|
else r.selectNodeContents(p);
|
||
|
range.selectNodeContents(p);
|
||
|
}
|
||
|
}
|
||
|
r.collapse(true);
|
||
|
range.collapse(true);
|
||
|
if (HTMLArea.is_safari) sel.setBaseAndExtent(r.startContainer,r.startOffset,r.endContainer,r.endOffset);
|
||
|
else sel.addRange(r);
|
||
|
else sel.addRange(range);
|
||
|
this.scrollToCaret();
|
||
|
return true;
|
||
|
};
|
||
|
/*
|
||
| typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js (working copy) | ||
|---|---|---|
|
***************************************************/
|
||
|
HTMLArea.getInnerText = function(el) {
|
||
|
var txt = '', i;
|
||
|
for(i=el.firstChild;i;i =i.nextSibling) {
|
||
|
if(i.nodeType == 3) txt += i.data;
|
||
|
else if(i.nodeType == 1) txt += HTMLArea.getInnerText(i);
|
||
|
if(el.firstChild) {
|
||
|
for(i=el.firstChild;i;i =i.nextSibling) {
|
||
|
if(i.nodeType == 3) txt += i.data;
|
||
|
else if(i.nodeType == 1) txt += HTMLArea.getInnerText(i);
|
||
|
}
|
||
|
} else {
|
||
|
if(el.nodeType == 3) txt = el.data;
|
||
|
}
|
||
|
return txt;
|
||
|
};
|
||
| ... | ... | |
|
if (HTMLArea.is_gecko) editor._detectURL(ev);
|
||
|
switch (ev.keyCode) {
|
||
|
case 13 : // KEY enter
|
||
|
case 13 : // KEY enter
|
||
|
if (HTMLArea.is_gecko && !ev.shiftKey && !editor.config.disableEnterParagraphs) {
|
||
|
editor._checkInsertP();
|
||
|
HTMLArea._stopEvent(ev);
|
||
|
editor.updateToolbar();
|
||
|
if ( editor._checkInsertP(ev)) HTMLArea._stopEvent(ev);
|
||
|
// update the toolbar state after some time
|
||
|
if (editor._timerToolbar) window.clearTimeout(editor._timerToolbar);
|
||
|
editor._timerToolbar = window.setTimeout("HTMLArea.updateToolbar(" + editor._editorNumber + ");", 50);
|
||
|
}
|
||
|
break;
|
||
|
case 8 : // KEY backspace
|
||
- « Previous
- 1
- 2
- Next »