r1465 - branches/bxe_2_0/js

Author: chregu
Date: Wed Apr  5 14:05:55 2006
New Revision: 1465

Modified:
   branches/bxe_2_0/js/bxeFunctions.js
   branches/bxe_2_0/js/table.js
Log:
make table code working...

Modified: branches/bxe_2_0/js/bxeFunctions.js
==============================================================================
--- branches/bxe_2_0/js/bxeFunctions.js	(original)
+++ branches/bxe_2_0/js/bxeFunctions.js	Wed Apr  5 14:05:55 2006
@@ -1586,7 +1586,13 @@
 	}
 	
 	var mod = mozilla.getWidgetModalBox(bxe_i18n.getText("Create Table"), function(values) {
-		var te = documentCreateTable(values["rows"], values["cols"],replaceNode._node);
+		
+		if (replaceNode && replaceNode._node) {
+			var te = documentCreateTable(values["rows"], values["cols"],replaceNode._node);
+		} else {
+			var te = documentCreateTable(values["rows"], values["cols"]);
+		}
+		
 		if(!te) {
 			alert(bxe_i18n.getText("Can't create table: invalid data"));
 		}
@@ -1595,13 +1601,16 @@
 
 			var sel = window.getSelection(); 	
 			if (!bxe_checkIsAllowedChild("","table",sel, true)) {
+				
 				var xmlnode = bxe_splitAtSelection();
 				xmlnode.parentNode.insertBefore(te,xmlnode);
 			} else {
-			
+				
 				sel.insertNodeRaw(te, true);
 			}
+			
 			bxe_table_createTableFinish(te,  values["rows"], values["cols"]);
+			
 			bxe_Transform();
 		/*} else if (window.bxe_ContextNode){
 			var newNode = te.init();
@@ -1609,10 +1618,12 @@
 			debug("valid? : " + newNode.isNodeValid());*/
 		} else if (replaceNode) {
 			replaceNode._node.parentNode.replaceChild(te, replaceNode._node);
+			
 			bxe_table_createTableFinish(te,  values["rows"], values["cols"]);
 			bxe_Transform();
 		}
 	});
+	
 	mod.addItem("rows",2,"textfield",bxe_i18n.getText("number of rows"));
 	mod.addItem("cols",2,"textfield",bxe_i18n.getText("number of cols"));
 	mod.show(100,50, "fixed");

Modified: branches/bxe_2_0/js/table.js
==============================================================================
--- branches/bxe_2_0/js/table.js	(original)
+++ branches/bxe_2_0/js/table.js	Wed Apr  5 14:05:55 2006
@@ -327,10 +327,11 @@
 	if((/\D+/.test(noRows)) || (/\D+/.test(noColumns)) || (noRows==0) || (noColumns==0))
 		return null; // go to exception
 	
-	te.XMLNode.isNodeValid(true,2);
 	
 	
 	var ac = te.XMLNode.allowedChildren;
+	
+	
 	if (ac.length >= 1)  {
 		var _hasMust = false;
 		for ( var i in ac) {
@@ -355,7 +356,7 @@
 			ret = this;
 		}
 	}
-	te.XMLNode.isNodeValid(true,2,true);
+	te.XMLNode.parentNode.isNodeValid(true,2,true);
 	
 	return te;
 }
-- 
Bx-editor-cvs mailing list
[email protected]
http://lists.bitflux.ch/cgi-bin/listinfo/bx-editor-cvs