r1643 - branches/bxe_2_0/mozile

Author: chregu
Date: Sun Nov 26 20:37:40 2006
New Revision: 1643

Modified:
   branches/bxe_2_0/mozile/mozCE.js
   branches/bxe_2_0/mozile/mozilekb.js
Log:
fix prev/next tab bug #354

Modified: branches/bxe_2_0/mozile/mozCE.js
==============================================================================
--- branches/bxe_2_0/mozile/mozCE.js	(original)
+++ branches/bxe_2_0/mozile/mozCE.js	Sun Nov 26 20:37:40 2006
@@ -236,8 +236,8 @@
 				var _h = par.XMLNode._htmlnode;
 				if (!makeDefault) {
 					var _pref = bxe_goToNextNode(cssr,true);
-					if (_pref && _pref.nodeType == 1) {_pref = _pref.lastChild;}
-					if (_pref && _pref.nodeValue) {
+					if (_pref && _pref.nodeType == 1) { _pref = _pref.lastChild;}
+					if (_pref && _pref.nodeValue) { 
 						sel.collapse(_pref,_pref.nodeValue.length);
 					} else {
 						//alert(_pref);

Modified: branches/bxe_2_0/mozile/mozilekb.js
==============================================================================
--- branches/bxe_2_0/mozile/mozilekb.js	(original)
+++ branches/bxe_2_0/mozile/mozilekb.js	Sun Nov 26 20:37:40 2006
@@ -670,20 +670,18 @@
 }
 
 function bxe_goToNextNode(cssr,shift) {
-	
-	if (cssr.startContainer.nodeType != 1) {
-		var node = cssr.startContainer.parentNode;
+	if (cssr.startContainer.nodeType == 1) {
+		var node = cssr.startContainer.firstChild;
 	} else {
 		var node = cssr.startContainer;
 	}
 	var walker = document.createTreeWalker(
-	document.documentElement, NodeFilter.SHOW_ELEMENT,
+	document.documentElement, NodeFilter.SHOW_TEXT,
 	null, 
 	true);
 	
 	walker.currentNode = node;
 	
-	
 	if (shift) {
 		node =   walker.previousNode();
 	} else {
@@ -691,12 +689,13 @@
 	}
 	var sel=window.getSelection();
 	do {
-		if (node.userModifiable && node.XMLNode && ( node.XMLNode.canHaveText || node.hasAttribute("__bxe_attribute"))) {
+		var par = node.parentNode;
+		if (par.userModifiable && par.XMLNode && ( par.XMLNode.canHaveText || par.hasAttribute("__bxe_attribute"))) {
 			try {
-				sel.collapse(node.firstChild,0);
+				sel.collapse(node,0);
 			} catch (e) {
-				node.appendChild(node.ownerDocument.createTextNode(" "));
-				sel.collapse(node.firstChild,0);
+				par.appendChild(par.ownerDocument.createTextNode(" "));
+				sel.collapse(node,0);
 			}
 			bxe_updateXPath(node);
 			return node;
-- 
Bx-editor-cvs mailing list
[email protected]
http://lists.bitflux.ch/cgi-bin/listinfo/bx-editor-cvs