r1550 - branches/bxe_2_0/mozile

Author: chregu
Date: Wed Oct 18 15:32:56 2006
New Revision: 1550

Modified:
   branches/bxe_2_0/mozile/mozCE.js
Log:
normalize input

Modified: branches/bxe_2_0/mozile/mozCE.js
==============================================================================
--- branches/bxe_2_0/mozile/mozCE.js	(original)
+++ branches/bxe_2_0/mozile/mozCE.js	Wed Oct 18 15:32:56 2006
@@ -760,7 +760,8 @@
 			elementName = bxe_config.options['autoParaElementName'];
 			elementNamespace = bxe_config.options['autoParaElementNamespace']
 		}
-		if (elementName && clipboard._system && content.data.search(/[\n\r]./) > -1) {
+		content.data = content.data.replace(/\r/g,"\n").replace(/\n+/g,"\n");
+		if (elementName && clipboard._system && content.data.search(/[\n]./) > -1) {
 			content = content.data;
 			content = content.replace(/&/g,"&amp;").replace(/</g,"&lt;");
 			var elementName_start = elementName;
@@ -769,7 +770,7 @@
 			}
 			if (elementNameGrandParent) {
 				content = content + "\n";
-				var row = content.match(/(.*[\n\r$]+)/g);
+				var row = content.match(/(.*[\n$]+)/g);
 				var content = "<" + elementNameGrandParent;
 				if (elementNamespace) {
 					content2 += " xmlns='"+elementNamespace +"'";
@@ -803,7 +804,8 @@
 				}
 				content += "</" + elementNameGrandParent + ">";
 			} else {
-				content = "<"+elementName_start + ">"+ content.replace(/[\n\r]+/g,"</"+elementName+"><"+elementName_start+" >")+"</"+elementName+">";
+				content = content.replace(/\n+$/,"");
+				content = "<"+elementName_start + ">"+ content.replace(/[\n]+/g,"</"+elementName+"><"+elementName_start+" >")+"</"+elementName+">";
 				
 				if (elementNameParent) {
 					var content2 = "<" + elementNameParent;
-- 
Bx-editor-cvs mailing list
[email protected]
http://lists.bitflux.ch/cgi-bin/listinfo/bx-editor-cvs