r1658 - in branches/bxe_2_0: js relaxng

Author: chregu
Date: Tue Apr 10 13:56:48 2007
New Revision: 1658

Log:
added bxe:noaddappenddelete


Modified:
   branches/bxe_2_0/js/bxeFunctions.js
   branches/bxe_2_0/js/widget.js
   branches/bxe_2_0/relaxng/RelaxNG.js

Modified: branches/bxe_2_0/js/bxeFunctions.js
==============================================================================
--- branches/bxe_2_0/js/bxeFunctions.js	(original)
+++ branches/bxe_2_0/js/bxeFunctions.js	Tue Apr 10 13:56:48 2007
@@ -670,12 +670,13 @@
 			BxeTextClipboard_OpenDialog(e);
 		});
 	}
-	
-	popup.addMenuItem(bxe_i18n.getText("Copy {0} Element", new Array(node.vdom.bxeName)), function (e) {
-		var widget = e.currentTarget.Widget;
-		var delNode = widget.MenuPopup.MainNode;
-		delNode.copy();
-	});
+	if (!node.vdom.bxeNoaddappenddelete) {
+		popup.addMenuItem(bxe_i18n.getText("Copy {0} Element", new Array(node.vdom.bxeName)), function (e) {
+			var widget = e.currentTarget.Widget;
+			var delNode = widget.MenuPopup.MainNode;
+			delNode.copy();
+	    });
+    }
 	var clip = mozilla.getClipboard();
 	
 	if (clip._clipboard) {
@@ -709,7 +710,7 @@
 			});
 		} 
 	}
-	if (node.vdom.bxeTabletype != "table-row") {
+	if (node.vdom.bxeTabletype != "table-row" && node.vdom.bxeTabletype != "table-cell" && !node.vdom.bxeNoaddappenddelete) {
 		popup.addMenuItem(bxe_i18n.getText("Delete {0} Element",new Array(node.vdom.bxeName)), function (e) {
 			var widget = e.currentTarget.Widget;
 			var delNode = widget.MenuPopup.MainNode;
@@ -850,15 +851,15 @@
 		while(_par && _par.vdom &&  _par.vdom.bxeTabletype == "table-row") {
 			 _par = _par.parentNode;
 		}
-		
-		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();
-		});
 		if ( node.vdom.bxeTabletype != "table-col") {
+		
+			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;

Modified: branches/bxe_2_0/js/widget.js
==============================================================================
--- branches/bxe_2_0/js/widget.js	(original)
+++ branches/bxe_2_0/js/widget.js	Tue Apr 10 13:56:48 2007
@@ -887,7 +887,7 @@
 	var ac = node.XMLNode.allowedNextSiblingsSorted;
 	
 	for (i = 0; i < ac.length; i++) {
-		if (ac[i].nodeType != 3 &&  !ac[i].vdom.bxeDontshow  && ac[i].vdom.bxeTabletype != "table-row" ) { // && !bxe_config.dontShowInContext[ac[i].namespaceURI + ":" +ac[i].localName]
+		if (ac[i].nodeType != 3 &&  !ac[i].vdom.bxeDontshow  && !ac[i].vdom.bxeNoaddappenddelete && ac[i].vdom.bxeTabletype != "table-row"  && ac[i].vdom.bxeTabletype != "table-col" ) { // && !bxe_config.dontShowInContext[ac[i].namespaceURI + ":" +ac[i].localName]
 				if (i == 0 || ac[i].vdom != ac[i-1].vdom) {
 				if (ac[i].vdom.bxeHelptext) {
 						var _helptext = ac[i].vdom.bxeHelptext;
@@ -899,8 +899,8 @@
 					eDOMEventCall("appendNode",document,{"appendToNode": widget.AppendToNode, "localName":widget.InsertLocalName,"namespaceURI":widget.InsertNamespaceURI})
 				
 				}, _helptext);
-				menui.InsertLocalName = ac[i].localName;
-				menui.InsertNamespaceURI = ac[i].namespaceURI;
+                menui.InsertLocalName = ac[i].localName;
+                menui.InsertNamespaceURI = ac[i].namespaceURI;
 				menui.AppendToNode = node.XMLNode;
 				}
 		}

Modified: branches/bxe_2_0/relaxng/RelaxNG.js
==============================================================================
--- branches/bxe_2_0/relaxng/RelaxNG.js	(original)
+++ branches/bxe_2_0/relaxng/RelaxNG.js	Tue Apr 10 13:56:48 2007
@@ -447,6 +447,9 @@
 				case "dontshow":
 					this.bxeDontshow = true;
 					break;
+				case "noaddappenddelete":
+					this.bxeNoaddappenddelete = true;
+					break;
 				case "noteditable":
 					this.bxeNoteditable = true;
 					break;
-- 
Bx-editor-cvs mailing list
[email protected]
http://lists.bitflux.ch/cgi-bin/listinfo/bx-editor-cvs