r1572 - branches/bxe_2_0/mozile

Author: chregu
Date: Tue Oct 24 17:13:29 2006
New Revision: 1572

Modified:
   branches/bxe_2_0/mozile/mozilekb.js
Log:
fix some cut/delete issues with nested elements

Modified: branches/bxe_2_0/mozile/mozilekb.js
==============================================================================
--- branches/bxe_2_0/mozile/mozilekb.js	(original)
+++ branches/bxe_2_0/mozile/mozilekb.js	Tue Oct 24 17:13:29 2006
@@ -638,7 +638,6 @@
 			sel.deleteSelection(backspace);
 		}
 		else if (!sel.isCollapsed && sel.anchorNode.nodeType == 3 && sel.anchorOffset == 0) {
-			
 			if (sel.anchorNode == sel.focusNode && sel.focusOffset == sel.anchorNode.nodeValue.strip().length) {
 				
 				var xmlnode = bxe_getXMLNodeByHTMLNode(sel.anchorNode);
@@ -654,11 +653,23 @@
 					sel.deleteSelection(false);
 				}
 			} else {
+				
+				var xmlnode = bxe_getXMLNodeByHTMLNode(sel.anchorNode);
+				var _par = xmlnode.parentNode;
 				bxe_deleteWholeSelection(sel,backspace);
+				
 				sel = window.getSelection();
+				
 				sel.deleteSelection(false);
+				try {
+					if (_par.childNodes.length == 1 && _par.firstChild.nodeValue.strip().length == 0) {
+						_par.removeChild(_par.firstChild);
+						_par.XMLNode.makeDefaultNodes();
+						bxe_Transform();
+					}
+				} catch(e) {
+				}
 			}
-			
 		} else {
 			bxe_history_snapshot();
 			cssr = sel.getEditableRange();
-- 
Bx-editor-cvs mailing list
[email protected]
http://lists.bitflux.ch/cgi-bin/listinfo/bx-editor-cvs