r1758 - branches/bxe_2_0/js

Author: chregu
Date: Fri Sep 14 11:10:07 2007
New Revision: 1758

Log:
more fixes for BXEB-4


Modified:
   branches/bxe_2_0/js/bxeXMLDocument.js

Modified: branches/bxe_2_0/js/bxeXMLDocument.js
==============================================================================
--- branches/bxe_2_0/js/bxeXMLDocument.js	(original)
+++ branches/bxe_2_0/js/bxeXMLDocument.js	Fri Sep 14 11:10:07 2007
@@ -121,17 +121,19 @@
 }
 
 XMLDocument.prototype.transformToXPathMode = function(xslfile) {
-	bxe_about_box.addText("Load XSLT ...");
-	var xsldoc = document.implementation.createDocument("", "", null);
-	xsldoc.addEventListener("load", onload_xsl, false);
-	xsldoc.xmldoc = this;
 	try {
+		bxe_about_box.addText("Load XSLT ...");
+		var xsldoc = document.implementation.createDocument("", "", null);
+		xsldoc.addEventListener("load", onload_xsl, false);
+		xsldoc.xmldoc = this;
+		xsldoc.async = true;
 		xsldoc.load(xslfile);
 	} catch(e) {
-		alert("The xslfile: '" + xslfile + "' was not found");
+		bxe_catch_alert(e);
 	}
 
 	function onload_xsl(e) {
+		try {
 		bxe_about_box.addText("XSLT loaded...");
 		xsldoc = e.currentTarget;
 		
@@ -146,6 +148,10 @@
 		xsltransformdoc.addEventListener("load", this.onload_xsltransform, false);
 		xsltransformdoc.xsldoc = xsldoc;
 		xsltransformdoc.load(mozile_root_dir + "xsl/transformxsl.xsl");
+		
+		} catch(f) {
+			 bxe_catch_alert(f);
+		}
 	}
 	
 	
@@ -154,6 +160,12 @@
 		var processor = new XSLTProcessor();
 		if (bxe_config.xmldoc._originalXslTransformDoc) {
 			xsltransformdoc = bxe_config.xmldoc._originalXslTransformDoc;
+			if (!bxe_config.xmldoc) {
+				bxe_alert("Something went wrong during loading the Transform-XSLT document. (bxe_config.xmldoc undefined) \n Try reloading or see console for details.");
+				bxe_dump( "Transform XSLDoc: " + xsltransformdoc.saveXML());
+				bxe_dump( e);
+				return false;
+			}
 			bxe_config.xmldoc._originalXslTransformDoc = null;
 		} else {
 			xsltransformdoc = e.currentTarget;
@@ -167,6 +179,13 @@
 		
 		try {
 			processor.importStylesheet(xsltransformdoc);
+			if (!xsltransformdoc.xsldoc) {
+				bxe_alert("Something went wrong during loading the Transform-XSLT document. (xsltransformdoc.xsldoc undefined)\n Try reloading or see console for details.");
+				bxe_dump( "Transform XSLDoc: " + xsltransformdoc.saveXML());
+				bxe_dump( e);
+				return false;
+			}
+			
 			var newDocument = processor.transformToDocument(xsltransformdoc.xsldoc);
 			// we have to reparse the transformed document, otherwise
 			// mozilla has a problem with xsl matchers with namespaces :(
@@ -183,7 +202,7 @@
 				alert ( f + "\n\n "+bxe_i18n.getText("xsltransformdoc.xsldoc is : ") + xsltransformdoc.xsldoc);
 			} else {
 				bxe_config.xmldoc._originalXslTransformCounter++;
-				bxe_about_box.addText("bxe_config.xmldoc._originalXslTransformCounter");
+				bxe_about_box.addText(bxe_config.xmldoc._originalXslTransformCounter);
 				window.setTimeout("bxe_config.xmldoc.onload_xsltransform(bxe_config.xmldoc._originalXslTransformEvent)",300);
 			}
 			return;
-- 
Bx-editor-cvs mailing list
[email protected]
http://lists.bitflux.ch/cgi-bin/listinfo/bx-editor-cvs