r1313 - branches/bxe_2_0/js

Author: chregu
Date: Wed May 25 11:36:19 2005
New Revision: 1313

Modified:
   branches/bxe_2_0/js/bxeFunctions.js
   branches/bxe_2_0/js/bxeNodeElements.js
   branches/bxe_2_0/js/widget.js
Log:
fix for 
http://bugs.bitflux.ch/cgi-bin/bugzilla/show_bug.cgi?id=789
"context menue auf attribute content geht nicht"


Modified: branches/bxe_2_0/js/bxeFunctions.js
==============================================================================
--- branches/bxe_2_0/js/bxeFunctions.js	(original)
+++ branches/bxe_2_0/js/bxeFunctions.js	Wed May 25 11:36:19 2005
@@ -640,13 +640,17 @@
 	if (node.xmlBridge) {
 		return 
 	}
+	if (node.nodeType == Node.ATTRIBUTE_NODE) {
+		node = node.parentNode;
+	}
+
 	if (node.vdom && node.vdom.hasAttributes ) {
 		
-		var menui = popup.addMenuItem("Edit " + e.target.XMLNode.vdom.bxeName  + " Attributes", mozilla.getWidgetGlobals().EditAttributes.popup);
+		var menui = popup.addMenuItem("Edit " + node.vdom.bxeName  + " Attributes", mozilla.getWidgetGlobals().EditAttributes.popup);
 		menui.MenuPopup._node = node._node;
 	}
 
-	popup.addMenuItem("Copy "  + e.target.XMLNode.vdom.bxeName  + " Element", function (e) {
+	popup.addMenuItem("Copy "  + node.vdom.bxeName  + " Element", function (e) {
 		var widget = e.currentTarget.Widget;
 		var delNode = widget.MenuPopup.MainNode;
 		delNode.copy();
@@ -1320,20 +1324,8 @@
 	if (!node) {
 		return true;
 	}
-	/*if(!cssr)
-	{
-		return true;
-	}
-	if (cssr.top._SourceMode) {
-		return true;
-	}
-	var node ;
-	if (cssr.startContainer.nodeType == Node.TEXT_NODE) {
-		node = cssr.startContainer.parentNode;
-	} else {
-		node = cssr.startContainer;
-	}*/
-	if (node.XMLNode.vdom.bxeNoteditable) {
+	
+	if (node.XMLNode.nodeType != Node.ATTRIBUTE_NODE && node.XMLNode.vdom.bxeNoteditable) {
 		return false;
 	}
 	/*if (node != e.target) {

Modified: branches/bxe_2_0/js/bxeNodeElements.js
==============================================================================
--- branches/bxe_2_0/js/bxeNodeElements.js	(original)
+++ branches/bxe_2_0/js/bxeNodeElements.js	Wed May 25 11:36:19 2005
@@ -259,12 +259,18 @@
 
 Node.prototype.getParentWithXMLNode = function() {
 	var node = this;
-	
 	while (node) {
 		
 		if (node.nodeType == 1) {
-			if (node.XMLNode && node.XMLNode.vdom) {
-				return node;
+			var nodeX = node.XMLNode;
+			if (nodeX) {
+				if (nodeX.nodeType == Node.ATTRIBUTE_NODE) {
+					return node;
+					
+				}
+				else if ( nodeX.vdom) {
+					return node;
+				}
 			}
 		}
 		node = node.parentNode;

Modified: branches/bxe_2_0/js/widget.js
==============================================================================
--- branches/bxe_2_0/js/widget.js	(original)
+++ branches/bxe_2_0/js/widget.js	Wed May 25 11:36:19 2005
@@ -631,7 +631,6 @@
 		this.node.removeAllChildren();
 		return true;
 	}
-	
 	if (node.nodeType == Node.TEXT_NODE) {
 		node = node.parentNode;
 	} 
@@ -746,7 +745,12 @@
 		
 	
 	this.Popup.removeAllMenuItems();
-	this.Popup.initTitle(node.XMLNode.vdom.bxeName);
+	if (node.XMLNode.nodeType == Node.ATTRIBUTE_NODE) {
+		var nodeX = node.XMLNode.parentNode;
+	} else {
+		var nodeX = node.XMLNode;
+	}
+	this.Popup.initTitle(nodeX.vdom.bxeName);
 	/* currently not working */
 	/*if (node.XMLNode.vdom.hasAttributes && this.Popup.EditAttributes) {
 		var menui = this.Popup.addMenuItem("Edit Attributes..", this.Popup.EditAttributes.popup);
@@ -759,7 +763,7 @@
 	//var ip = documentCreateInsertionPoint(cssr.top, cssr.startContainer, cssr.startOffset);
 	var selNode = cssr.startContainer.XMLNode;
 	if (!(sel.isCollapsed) && node.getAttribute("__bxe_defaultcontent") != "true") {
-			var ac = node.XMLNode.allowedChildren;
+			var ac = nodeX.allowedChildren;
 			
 			for (i = 0; i < ac.length; i++) {
 				if (ac[i].nodeType != 3) {
@@ -774,7 +778,7 @@
 					});
 					menui.InsertLocalName = ac[i].localName;
 					menui.InsertNamespaceURI = ac[i].namespaceURI;
-					menui.AppendToNode = node.XMLNode;
+					menui.AppendToNode = nodeX;
 					menui.Cssr = cssr;
 				}
 				}
@@ -783,7 +787,7 @@
 	
 	this.Popup._node = node;
 	this.Popup.addSeparator(" Append to ");
-	node = node.XMLNode;
+	node = nodeX;
 	
 	//parent nodes
 	while(node && node.nodeType == 1) {
-- 
Bx-editor-cvs mailing list
[email protected]
http://lists.bitflux.ch/cgi-bin/listinfo/bx-editor-cvs