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

Merge branch '3.0'

Browse Source
This commit is contained in:
Simon Kornblith 2012-07-23 23:48:51 -04:00
commit 9817b02181
2 changed files with 66 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chrome/content/zotero/xpcom/translation/translate.js
View File

@ -510,6 +510,8 @@ Zotero.Translate.Sandbox = {
* @param {SandboxItem} An item created using the Zotero.Item class from the sandbox * @param {SandboxItem} An item created using the Zotero.Item class from the sandbox
*/ */
"_itemDone":function(translate, item) { "_itemDone":function(translate, item) {
// Only apply checks if there is no parent translator
if(!translate._parentTranslator) {
if(!item.itemType) { if(!item.itemType) {
item.itemType = "webpage"; item.itemType = "webpage";
translate._debug("WARNING: No item type specified"); translate._debug("WARNING: No item type specified");
@ -580,6 +582,7 @@ Zotero.Translate.Sandbox = {
} }
} }
} }
}
// call super // call super
Zotero.Translate.Sandbox.Base._itemDone(translate, item); Zotero.Translate.Sandbox.Base._itemDone(translate, item);

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

@ -417,6 +417,8 @@ Zotero.Translate.SandboxManager = function(sandboxLocation) {
return s.serializeToString(Zotero.Translate.DOMWrapper.unwrap(doc)); return s.serializeToString(Zotero.Translate.DOMWrapper.unwrap(doc));
}; };
}; };
this.sandbox.XMLSerializer.__exposedProps__ = {"prototype":"r"};
this.sandbox.XMLSerializer.prototype = {};
} }
Zotero.Translate.SandboxManager.prototype = { Zotero.Translate.SandboxManager.prototype = {