r1437 - branches/bxe_2_0/mozile

Author: chregu
Date: Thu Dec 22 17:41:53 2005
New Revision: 1437

Modified:
   branches/bxe_2_0/mozile/mozCE.js
Log:
more fixes for selection of nodes

Modified: branches/bxe_2_0/mozile/mozCE.js
==============================================================================
--- branches/bxe_2_0/mozile/mozCE.js	(original)
+++ branches/bxe_2_0/mozile/mozCE.js	Thu Dec 22 17:41:53 2005
@@ -204,7 +204,7 @@
 			var sel = window.getSelection();
 			cssr = this.getEditableRange();
 			var par = cssr.startContainer.parentNode.XMLNode._node;
-			
+			par.normalize();
 			if (par.childNodes.length <= 1) {
 				// if attributenode
 				if (par.nodeType == 2) {
@@ -213,20 +213,25 @@
 				} else {
 					var parpar = par.parentNode;
 					var nextSibling = par.nextSibling;
-					parpar.removeChild(par);
+					if (! (par.XMLNode.vdom.bxeTabletype == "table-cell" || par.XMLNode.vdom.bxeTabletype == "table-col" )){
+						parpar.removeChild(par);
+					}
+					
 				}
 				if (!parpar.XMLNode.isNodeValid(true,2,true)) {
-					
-						var _new = parpar.insertBefore(parpar.ownerDocument.createElementNS(par.namespaceURI,par.localName),nextSibling);
-						_new.XMLNode = _new.getXMLNode();
-						_new.XMLNode.makeDefaultNodes();
+					var _new = parpar.insertBefore(parpar.ownerDocument.createElementNS(par.namespaceURI,par.localName),nextSibling);
+					_new.XMLNode = _new.getXMLNode();
+					_new.XMLNode.makeDefaultNodes();
 				}
 				parpar.normalize();
 				var _h = par.XMLNode._htmlnode;
 				var _pref = _h.previousSibling;
 				_h.parentNode.removeChild(_h);
-				if (_pref) {
+				if (_pref && _pref.nodeType == 1) {_pref = _pref.lastChild;}
+				if (_pref && _pref.nodeValue) {
 					sel.collapse(_pref,_pref.nodeValue.length);
+				} else {
+					//alert(_pref);
 				}
 				
 				sel.collapseToStart();
@@ -389,7 +394,9 @@
 			} else {
 				cssr.extractContentsByCSS();
 				this.anchorNode.parentNode.removeAttribute("__bxe_defaultcontent");
-				this.anchorNode.parentNode.XMLNode._node.removeAttribute("__bxe_defaultcontent");
+				if (this.anchorNode.parentNode.XMLNode) {
+					this.anchorNode.parentNode.XMLNode._node.removeAttribute("__bxe_defaultcontent");
+				}
 			}
 			if (textNode.parentNode == xmlnode) {
 				xmlnode.removeChild(textNode);
-- 
Bx-editor-cvs mailing list
[email protected]
http://lists.bitflux.ch/cgi-bin/listinfo/bx-editor-cvs