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

Merge branch '3.0'

Browse source
This commit is contained in:
Simon Kornblith 2012-07-27 18:47:51 -04:00
commit fef0970dce
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -677,6 +677,11 @@ Zotero.Translate.Sandbox = {
* @borrows Zotero.Translate.Sandbox.Web._itemDone as this._itemDone * @borrows Zotero.Translate.Sandbox.Web._itemDone as this._itemDone
*/ */
"_itemDone":function(translate, item) { "_itemDone":function(translate, item) {
// Always set library catalog, even if we have a parent translator
if(item.libraryCatalog === undefined) {
item.libraryCatalog = translate.translator[0].label;
}
Zotero.Translate.Sandbox.Web._itemDone(translate, item); Zotero.Translate.Sandbox.Web._itemDone(translate, item);
} }
} }

5
chrome/content/zotero/xpcom/utilities.js
View file

@ -975,6 +975,11 @@ Zotero.Utilities = {
} }
try { try {
if(!rootDoc.evaluate && typeof installXPathIfNecessary !== undefined) {
// For IE: element.ownerDocument will not have an evaluate property,
// since this is provided by JavaScript-XPath
installXPathIfNecessary('defaultView' in rootDoc ? rootDoc.defaultView : rootDoc.parentWindow);
}
var xpathObject = rootDoc.evaluate(xpath, element, nsResolver, 5, // 5 = ORDERED_NODE_ITERATOR_TYPE var xpathObject = rootDoc.evaluate(xpath, element, nsResolver, 5, // 5 = ORDERED_NODE_ITERATOR_TYPE
null); null);
} catch(e) { } catch(e) {