r1521 - branches/bxe_2_0/js

Author: chregu
Date: Mon Oct  2 17:59:29 2006
New Revision: 1521

Modified:
   branches/bxe_2_0/js/bxeFunctions.js
   branches/bxe_2_0/js/table.js
Log:
#35
add table functions to c-menu


Modified: branches/bxe_2_0/js/bxeFunctions.js
==============================================================================
--- branches/bxe_2_0/js/bxeFunctions.js	(original)
+++ branches/bxe_2_0/js/bxeFunctions.js	Mon Oct  2 17:59:29 2006
@@ -784,7 +784,7 @@
 		
 	}
 
-	if (node.vdom.bxeTabletype && node.vdom.bxeTabletype == "table-cell") {
+	if (node.vdom.bxeTabletype && (node.vdom.bxeTabletype == "table-cell" || node.vdom.bxeTabletype == "table-col" )) {
 			popup.addSeparator();
 		// merge right
 	//	popup.addSeparator();
@@ -818,7 +818,7 @@
 		while (nextSibling && nextSibling.nodeType != 1) {
 			nextSibling = nextSibling.nextSibling;
 		}
-		if (nextSibling && (nextSibling.vdom.bxeTabletype == "table-cell")) {
+		if (nextSibling && (nextSibling.vdom.bxeTabletype == "table-cell" || nextSibling.vdom.bxeTabletype == "table-col" )) {
 			var menui = popup.addMenuItem(bxe_i18n.getText("Merge right"), function(e) {
 				var widget = e.currentTarget.Widget;
 				var _par = widget.MenuPopup.MainNode._node.parentNode;
@@ -829,7 +829,7 @@
 		}
 	
 		var _par = node.parentNode;
-		while(_par && _par.vdom.bxeTabletype == "table-row") {
+		while(_par && _par.vdom &&  _par.vdom.bxeTabletype == "table-row") {
 			 _par = _par.parentNode;
 		}
 		
@@ -851,32 +851,34 @@
 			}
 		}*/
 		var menui = popup.addMenuItem(bxe_i18n.getText("Merge down"), function(e) {
-					var widget = e.currentTarget.Widget;
-					var _par = widget.MenuPopup.MainNode._node.parentNode;
-					widget.MenuPopup.MainNode._node.TableCellMergeDown();
-					bxe_Transform(true,false,widget.MenuPopup.MainNode.parentNode);
-					//_par.updateXMLNode();
-				});
-		
-		var menui = popup.addMenuItem(bxe_i18n.getText("Append Row"), function(e) {
 			var widget = e.currentTarget.Widget;
-			
-			widget.MenuPopup.MainNode._node.TableAppendRow();
-			bxe_Transform(false,false,widget.MenuPopup.MainNode.parentNode);
-			
+			var _par = widget.MenuPopup.MainNode._node.parentNode;
+			widget.MenuPopup.MainNode._node.TableCellMergeDown();
+			bxe_Transform(true,false,widget.MenuPopup.MainNode.parentNode);
+			//_par.updateXMLNode();
 		});
+		if ( node.vdom.bxeTabletype != "table-col") {
+			
+			var menui = popup.addMenuItem(bxe_i18n.getText("Append Row"), function(e) {
+				var widget = e.currentTarget.Widget;
+				
+				widget.MenuPopup.MainNode._node.TableAppendRow();
+				bxe_Transform(false,false,widget.MenuPopup.MainNode.parentNode.parentNode);
+				
+			});
+		}
 		var menui = popup.addMenuItem(bxe_i18n.getText("Append Col"), function(e) {
 			var widget = e.currentTarget.Widget;
 			var _par = widget.MenuPopup.MainNode._node.parentNode.parentNode;
 			widget.MenuPopup.MainNode._node.TableAppendCol();
-			bxe_Transform(true,false,widget.MenuPopup.MainNode.parentNode);
+			bxe_Transform(true,false,widget.MenuPopup.MainNode.parentNode.parentNode);
 			
 		});
 		var menui = popup.addMenuItem(bxe_i18n.getText("Remove Row"), function(e) {
 			var widget = e.currentTarget.Widget;
 			var _par = widget.MenuPopup.MainNode._node.parentNode.parentNode;
 			widget.MenuPopup.MainNode._node.TableRemoveRow();
-			bxe_Transform(true,false,widget.MenuPopup.MainNode.parentNode);
+			bxe_Transform(true,false,widget.MenuPopup.MainNode.parentNode.parentNode);
 			
 		});
 		
@@ -884,7 +886,7 @@
 			var widget = e.currentTarget.Widget;
 			var _par = widget.MenuPopup.MainNode._node.parentNode.parentNode;
 			widget.MenuPopup.MainNode._node.TableRemoveCol();
-			bxe_Transform(true,false,widget.MenuPopup.MainNode.parentNode);
+			bxe_Transform(true,false,widget.MenuPopup.MainNode.parentNode.parentNode);
 			
 		});
 		

Modified: branches/bxe_2_0/js/table.js
==============================================================================
--- branches/bxe_2_0/js/table.js	(original)
+++ branches/bxe_2_0/js/table.js	Mon Oct  2 17:59:29 2006
@@ -306,7 +306,7 @@
 	var cellLeft = null;
 	var pos;
 	for (var i=0; i< tr.childNodes.length; i++) {
-		if (tr.childNodes[i].XMLNode.vdom.bxeTabletype == "table-cell") {
+		if (tr.childNodes[i].XMLNode.vdom.bxeTabletype == "table-cell" || tr.childNodes[i].XMLNode.vdom.bxeTabletype == "table-col") {
 			if (tr.childNodes[i] == td) {
 				pos = i;
 				break;
@@ -464,7 +464,7 @@
 		return;
 	}
 	// <cope> changed != "entry" to "xhtml:td" in order to get the fucking col/rowspan work
-	if (BX_range.startContainer.parentNode.XMLNode.vdom.bxeTabletype == "table-cell")
+	if (BX_range.startContainer.parentNode.XMLNode.vdom.bxeTabletype == "table-cell" || BX_range.startContainer.parentNode.XMLNode.vdom.bxeTabletype == "table-col")
 	{
 		alert(bxe_i18n.getText("No table-cell (but {0}) selected, please choose one",new Array(BX_range.startContainer.parentNode.nodeName)));
 		return ;
-- 
Bx-editor-cvs mailing list
[email protected]
http://lists.bitflux.ch/cgi-bin/listinfo/bx-editor-cvs