www

commit d8783a93a0c4f9880020723a79d3667173f60aec
parent 8963dc7d9754cc83d754f0f774c5c76231e5bd29
Author: Simon Kornblith <simon@simonster.com>
Date:   Sun,  1 Jul 2012 15:54:37 -0400

Update for new wrapping code and complain on attempts to activate E4X, part 2

Diffstat:
M
chrome/content/zotero/xpcom/translation/translate_firefox.js
 | 
21
++++++++++-----------

1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/chrome/content/zotero/xpcom/translation/translate_firefox.js b/chrome/content/zotero/xpcom/translation/translate_firefox.js
@@ -731,17 +731,14 @@ Zotero.Translate.IO.Read.prototype = {
 	},
 	
 	"_getXML":function() {
-		if(this._mode == "xml/dom") {
-			try {
-				var xml = Zotero.Translate.IO.parseDOMXML(this._rawStream, this._charset, this.file.fileSize);
-			} catch(e) {
-				this._xmlInvalid = true;
-				throw e;
-			}
-			return (Zotero.isFx5 ? Zotero.Translate.SandboxManager.Fx5DOMWrapper(xml) : xml);
-		} else {
-			return this._readToString().replace(/<\?xml[^>]+\?>/, "");
+		if(this.bytesRead !== 0) this._seekToStart(this._charset);
+		try {
+			var xml = Zotero.Translate.IO.parseDOMXML(this._rawStream, this._charset, this.file.fileSize);
+		} catch(e) {
+			this._xmlInvalid = true;
+			throw e;
 		}
+		return (Zotero.isFx ? Zotero.Translate.DOMWrapper.wrap(xml) : xml);
 	},
 	
 	"init":function(newMode, callback) {
@@ -751,7 +748,9 @@ Zotero.Translate.IO.Read.prototype = {
 		this._seekToStart(this._charset);
 		
 		this._mode = newMode;
-		if(Zotero.Translate.IO.rdfDataModes.indexOf(this._mode) !== -1 && !this.RDF) {
+		if(newMode === "xml/e4x") {
+			throw "E4X is not supported";
+		} else if(Zotero.Translate.IO.rdfDataModes.indexOf(this._mode) !== -1 && !this.RDF) {
 			this._initRDF();
 		}