From b266f1414a70f1b24f4198f77b898e513d734601 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Fri, 27 Jul 2012 18:27:08 -0400 Subject: [PATCH 1/2] Always set libraryCatalog for search translators, even when a parent translator is present --- chrome/content/zotero/xpcom/translation/translate.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js index aca9cca686..839a06693c 100644 --- a/chrome/content/zotero/xpcom/translation/translate.js +++ b/chrome/content/zotero/xpcom/translation/translate.js @@ -689,6 +689,11 @@ Zotero.Translate.Sandbox = { * @borrows Zotero.Translate.Sandbox.Web._itemDone as this._itemDone */ "_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); } } From cb7640a96a2ff19ba8f6e2526954f3b888f0f357 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Fri, 27 Jul 2012 18:47:35 -0400 Subject: [PATCH 2/2] ZU.xpath tweak for IE --- chrome/content/zotero/xpcom/utilities.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js index fc95506c1e..6d79842822 100644 --- a/chrome/content/zotero/xpcom/utilities.js +++ b/chrome/content/zotero/xpcom/utilities.js @@ -982,6 +982,11 @@ Zotero.Utilities = { } 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 null); } catch(e) {