r1542 - in branches/bxe_2_0: js mozile

Author: chregu
Date: Mon Oct 16 16:52:58 2006
New Revision: 1542

Modified:
   branches/bxe_2_0/js/widget.js
   branches/bxe_2_0/mozile/mozCE.js
Log:
make table inserts possible


Modified: branches/bxe_2_0/js/widget.js
==============================================================================
--- branches/bxe_2_0/js/widget.js	(original)
+++ branches/bxe_2_0/js/widget.js	Mon Oct 16 16:52:58 2006
@@ -1137,6 +1137,10 @@
 	}
 	e.preventDefault();
 	e.stopPropagation();
+	if (BxeTextClipboard_keyhandler) {
+					document.removeEventListener("keypress", BxeTextClipboard_keyhandler, true);
+	}
+	
 }
 		
 		
@@ -1155,7 +1159,11 @@
 			cancel.setAttribute("value",bxe_i18n.getText("Cancel"));
 			cancel.name="__cancel";
 			this.hasTable.parentNode.addEventListener("reset", function(e) { 
-				bxe_registerKeyHandlers(); 
+				if (BxeTextClipboard_keyhandler) {
+					document.removeEventListener("keypress", BxeTextClipboard_keyhandler, true);
+				}
+				bxe_registerKeyHandlers();
+				
 				e.target.Widget.hide();
 			}, false);
 			this.hasTable.parentNode.appendChild(cancel);

Modified: branches/bxe_2_0/mozile/mozCE.js
==============================================================================
--- branches/bxe_2_0/mozile/mozCE.js	(original)
+++ branches/bxe_2_0/mozile/mozCE.js	Mon Oct 16 16:52:58 2006
@@ -735,6 +735,7 @@
 	
 	if (content && content.data) {
 		var elementNameParent = null;
+		var elementNameGrandParent = null;
 		var elementNamespace = null;
 		var elementName = null;
 		if (paraElementVdom == "__text__") {
@@ -743,7 +744,13 @@
 			if (paraElementVdom.namespaceURI) {
 				elementNamespace = paraElementVdom.namespaceURI;
 			}
-			if (paraElementVdom.bxeClipboardChild) {
+			
+			if (paraElementVdom.bxeClipboardGrandChild) {
+				elementName = paraElementVdom.bxeClipboardGrandChild;
+				elementNameParent = paraElementVdom.bxeClipboardChild;
+				elementNameGrandParent = paraElementVdom.nodeName;
+			}
+			else if (paraElementVdom.bxeClipboardChild) {
 				elementName = paraElementVdom.bxeClipboardChild;
 				elementNameParent = paraElementVdom.nodeName;
 			} else {
@@ -760,14 +767,39 @@
 			if (elementNamespace) {
 				elementName_start += " xmlns='"+elementNamespace +"'";
 			}
-			content = "<"+elementName_start + ">"+ content.replace(/[\n\r]+/g,"</"+elementName+"><"+elementName_start+" >")+"</"+elementName+">";
-			
-			if (elementNameParent) {
-				var content2 = "<" + elementNameParent;
+			if (elementNameGrandParent) {
+				content = content + "\n";
+				var row = content.match(/(.*[\n\r$]+)/g);
+				var content = "<" + elementNameGrandParent;
 				if (elementNamespace) {
 					content2 += " xmlns='"+elementNamespace +"'";
 				}
-				content = content2 + ">" + content + "</" + elementNameParent + ">";
+				content += ">";
+				for (var i = 0; i < row.length; i++) {
+					content += "<"+ elementNameParent +">";
+					row[i] = row[i] + "\t";
+					var cell = row[i].match(/([^\t]*[\t$]+)/g);
+					for (var j = 0; j < cell.length; j++) {
+						content += "<"+elementName_start + ">";
+						console.log(cell[j]);
+						content += cell[j];
+						content += "</" + elementName + ">";
+					}
+					content += "</"+ elementNameParent +">";
+				}
+				content += "</" + elementNameGrandParent + ">";
+				
+				console.log(content);
+			} else {
+				content = "<"+elementName_start + ">"+ content.replace(/[\n\r]+/g,"</"+elementName+"><"+elementName_start+" >")+"</"+elementName+">";
+				
+				if (elementNameParent) {
+					var content2 = "<" + elementNameParent;
+					if (elementNamespace) {
+						content2 += " xmlns='"+elementNamespace +"'";
+					}
+					content = content2 + ">" + content + "</" + elementNameParent + ">";
+				}
 			}
 			bxe_insertContent_async(content,BXE_SELECTION,BXE_SPLIT_IF_INLINE);
 		} else {
-- 
Bx-editor-cvs mailing list
[email protected]
http://lists.bitflux.ch/cgi-bin/listinfo/bx-editor-cvs