mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

general fix for JSTOR-like E4X wrapping issues

Browse source
This commit is contained in:
Simon Kornblith 2011-01-13 19:56:10 +00:00
parent f712ea8d40
commit 92262774a2
1 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
chrome/content/zotero/xpcom/translation/translate.js
View file

@ -573,6 +573,7 @@ Zotero.Translate.Base.prototype = {
// otherwise, fail silently, so as not to interfere with
// interface cleanup
Zotero.debug("Translate: "+e+' in handler '+i+' for '+type, 5);
Zotero.logError(e);
}
}
}
@ -772,16 +773,14 @@ Zotero.Translate.Base.prototype = {
"_generateSandbox":function() {
Zotero.debug("Translate: Binding sandbox to "+(typeof this._sandboxLocation == "object" ? this._sandboxLocation.document.location : this._sandboxLocation), 4);
this._sandboxManager = new Zotero.Translate.SandboxManager(this, this._sandboxLocation);
this._sandboxManager.eval("var Zotero = {};"+
const createArrays = "['creators', 'notes', 'tags', 'seeAlso', 'attachments']";
var src = "var Zotero = {};"+
"Zotero.Item = function (itemType) {"+
"this.itemType = itemType;"+
"this.creators = [];"+
"this.notes = [];"+
"this.tags = [];"+
"this.seeAlso = [];"+
"this.attachments = [];"+
"for each(var array in "+createArrays+") {"+
"this[array] = [];"+
"}"+
"};"+
"Zotero.Item.prototype.complete = function() { Zotero._itemDone(this); };"+
"Zotero.Collection = function () {};"+
"Zotero.Collection.prototype.complete = function() { Zotero._collectionDone(this); };"+
// https://bugzilla.mozilla.org/show_bug.cgi?id=609143 - can't pass E4X to sandbox in Fx4
@ -793,9 +792,28 @@ Zotero.Translate.Base.prototype = {
"var item = JSON.parse(itemString);"+
"item.complete = Zotero.Item.prototype.complete;"+
"return item;"+
"};"
);
"};"+
"Zotero.Item.prototype.complete = function() { ";
if(Zotero.isFx) {
// workaround for inadvertant attempts to pass E4X back from sandbox
src += "for(var key in this) {"+
"if("+createArrays+".indexOf(key) !== -1) {"+
"for each(var item in this[key]) {"+
"for(var key2 in item[key2]) {"+
"if(typeof item[key2] === 'xml') {"+
"item[key2] = item[key2].toString();"+
"}"+
"}"+
"}"+
"} else if(typeof this[key] === 'xml') {"+
"this[key] = this[key].toString();"+
"}"+
"}";
}
src += "Zotero._itemDone(this);"+
"}";
this._sandboxManager.eval(src);
this._sandboxManager.importObject(this.Sandbox, this);
this._sandboxManager.importObject({"Utilities":new Zotero.Utilities.Translate(this)});
this._sandboxManager.sandbox.Zotero.Utilities.HTTP = this._sandboxManager.sandbox.Zotero.Utilities;