suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Simon Kornblith 2012-07-01 15:54:37 -04:00
parent 8963dc7d97
commit d8783a93a0
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
chrome/content/zotero/xpcom/translation/translate_firefox.js
View File

@ -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();
}