r1423 - in branches/bxe_2_0: js mozile

Author: chregu
Date: Fri Dec 16 11:31:54 2005
New Revision: 1423

Modified:
   branches/bxe_2_0/js/bxeFunctions.js
   branches/bxe_2_0/js/table.js
   branches/bxe_2_0/mozile/eDOMXHTML.js
Log:
new table creation code


Modified: branches/bxe_2_0/js/bxeFunctions.js
==============================================================================
--- branches/bxe_2_0/js/bxeFunctions.js	(original)
+++ branches/bxe_2_0/js/bxeFunctions.js	Fri Dec 16 11:31:54 2005
@@ -1590,6 +1590,7 @@
 			
 				sel.insertNodeRaw(te, true);
 			}
+			bxe_table_createTableFinish(te,  values["rows"], values["cols"]);
 			bxe_Transform();
 		/*} else if (window.bxe_ContextNode){
 			var newNode = te.init();
@@ -1597,6 +1598,7 @@
 			debug("valid? : " + newNode.isNodeValid());*/
 		} else if (replaceNode) {
 			replaceNode._node.parentNode.replaceChild(te, replaceNode._node);
+			bxe_table_createTableFinish(te,  values["rows"], values["cols"]);
 			bxe_Transform();
 		}
 	});

Modified: branches/bxe_2_0/js/table.js
==============================================================================
--- branches/bxe_2_0/js/table.js	(original)
+++ branches/bxe_2_0/js/table.js	Fri Dec 16 11:31:54 2005
@@ -322,6 +322,41 @@
 	}
 }
 
+function bxe_table_createTableFinish (te, noRows, noColumns)  { 
+	//FIXME: this code should maybe use the matrix code and not something self built ...
+	if((/\D+/.test(noRows)) || (/\D+/.test(noColumns)) || (noRows==0) || (noColumns==0))
+		return null; // go to exception
+	
+	te.XMLNode.isNodeValid(true,2);
+	var rowInfo = bxe_table_getTableRowInfo(te);
+	
+	for(var i=0; i<noRows; i++)
+	{
+		
+		//var tre = documentCreateXHTMLElement("tr");
+		var tre = bxe_config.doc.createElementNS(rowInfo.namespaceURI, rowInfo.localName);
+		te.appendChild(tre);
+		tre.XMLNode = tre.getXMLNode();
+		tre.XMLNode.isNodeValid(true,2);
+		tre.appendChild(document.createTextNode("\n"));
+		for(var j=0; j<noColumns;j++)
+		{
+			tre.appendChild(document.createTextNode("  "));
+			var tde = tre.createNewTableCell();
+			//FIXME hardcoded stuff, should be taken from relaxng
+			/*tde.setAttribute("valign","top");
+			tde.setAttribute("align","left");
+			tde.setAttribute("colspan","1");
+			tde.setAttribute("rowspan","1");
+			tde.appendChild(document.createTextNode(STRING_NBSP)); // POST05: CHANGE TO BR TOKEN
+			*/
+			tre.appendChild(tde);
+			tre.appendChild(document.createTextNode("\n"));
+		}
+		te.appendChild(document.createTextNode("\n"));
+	}
+	return te;
+}
 
 function bxe_table_newtable(id)
 {

Modified: branches/bxe_2_0/mozile/eDOMXHTML.js
==============================================================================
--- branches/bxe_2_0/mozile/eDOMXHTML.js	(original)
+++ branches/bxe_2_0/mozile/eDOMXHTML.js	Fri Dec 16 11:31:54 2005
@@ -823,30 +823,6 @@
 	var te = documentCreateXHTMLElement("table");
 	te.XMLNode = te.getXMLNode();
 	te.appendChild(document.createTextNode("\n"));
-	var rowInfo = bxe_table_getTableRowInfo(te);
 	
-	for(var i=0; i<noRows; i++)
-	{
-		
-		//var tre = documentCreateXHTMLElement("tr");
-		var tre = bxe_config.doc.createElementNS(rowInfo.namespaceURI, rowInfo.localName);
-		te.appendChild(tre);
-		tre.appendChild(document.createTextNode("\n"));
-		for(var j=0; j<noColumns;j++)
-		{
-			tre.appendChild(document.createTextNode("  "));
-			var tde = tre.createNewTableCell();
-			//FIXME hardcoded stuff, should be taken from relaxng
-			/*tde.setAttribute("valign","top");
-			tde.setAttribute("align","left");
-			tde.setAttribute("colspan","1");
-			tde.setAttribute("rowspan","1");
-			tde.appendChild(document.createTextNode(STRING_NBSP)); // POST05: CHANGE TO BR TOKEN
-			*/
-			tre.appendChild(tde);
-			tre.appendChild(document.createTextNode("\n"));
-		}
-		te.appendChild(document.createTextNode("\n"));
-	}
 	return te;
 }
-- 
Bx-editor-cvs mailing list
[email protected]
http://lists.bitflux.ch/cgi-bin/listinfo/bx-editor-cvs