r1389 - branches/bxe_2_0/relaxng

Author: chregu
Date: Thu Sep 22 15:02:09 2005
New Revision: 1389

Modified:
   branches/bxe_2_0/relaxng/RelaxNG.js
Log:
revert the zeroOrMore patch, it didn't work

Modified: branches/bxe_2_0/relaxng/RelaxNG.js
==============================================================================
--- branches/bxe_2_0/relaxng/RelaxNG.js	(original)
+++ branches/bxe_2_0/relaxng/RelaxNG.js	Thu Sep 22 15:02:09 2005
@@ -412,7 +412,6 @@
 	}
 	var newChoice;
 	var newOneOrMore;
-	var newZeroOrMore;
 	
 	
 	for (var i = 0; i < childNodes.length; i++) {
@@ -464,7 +463,7 @@
 			}
 		}
 		
-		if (!(childNodes[i].nodeType == Node.ELEMENT_NODE && childNodes[i].hasRelaxNGNamespace)) {continue;}
+		if (!(childNodes[i].nodeType == 1 && childNodes[i].hasRelaxNGNamespace)) {continue;}
 		switch (childNodes[i].localName) {
 			case "element": 
 				var newElement = new ElementVDOM(childNodes[i]);
@@ -515,10 +514,11 @@
 				this._hasEmpty = false;
 				break;
 			case "zeroOrMore":
-				newZeroOrMore = new ZeroOrMoreVDOM(childNodes[i]);
-				this.appendChild(newZeroOrMore);
-				this._hasEmpty = true;
-				newZeroOrMore.parseChildren(childNodes[i]);
+				newOneOrMore = new OneOrMoreVDOM(childNodes[i]);
+				this.appendChild(newOneOrMore);
+				newOneOrMore.appendChild(new EmptyVDOM());
+				newOneOrMore.parseChildren(childNodes[i]);
+				this._hasEmpty = false;
 				break;
 			case "attribute":
 				this.addAttributeNode( new AttributeVDOM(childNodes[i]));
-- 
Bx-editor-cvs mailing list
[email protected]
http://lists.bitflux.ch/cgi-bin/listinfo/bx-editor-cvs