diff --git a/chrome/content/zotero/fileInterface.js b/chrome/content/zotero/fileInterface.js index 58134fc04..a8e29f73c 100644 --- a/chrome/content/zotero/fileInterface.js +++ b/chrome/content/zotero/fileInterface.js @@ -195,7 +195,17 @@ var Zotero_File_Interface = new function() { /** * Creates Zotero.Translate instance and shows file picker for file import */ - function importFile(file, createNewCollectionOverride) { + function importFile(file, createNewCollection) { + if(createNewCollection === undefined) { + createNewCollection = true; + } else if(!createNewCollection) { + try { + if (!ZoteroPane.collectionsView.editable) { + ZoteroPane.collectionsView.selectLibrary(null); + } + } catch(e) {} + } + var translation = new Zotero.Translate.Import(); if(!file) { var translators = translation.getTranslators(); @@ -218,18 +228,6 @@ var Zotero_File_Interface = new function() { file = fp.file; } - var createNewCollection; - if(createNewCollectionOverride === undefined) { - createNewCollection = true; - } else if(!createNewCollectionOverride) { - createNewCollection = createNewCollectionOverride; - try { - if (!ZoteroPane.collectionsView.editable) { - ZoteroPane.collectionsView.selectLibrary(null); - } - } catch(e) {} - } - translation.setLocation(file); // get translators again, bc now we can check against the file translation.setHandler("translators", function(obj, item) { @@ -271,6 +269,12 @@ var Zotero_File_Interface = new function() { var translate = new Zotero.Translate.Import(); translate.setString(str); + + try { + if (!ZoteroPane.collectionsView.editable) { + ZoteroPane.collectionsView.selectLibrary(null); + } + } catch(e) {} translate.setHandler("translators", function(obj, item) { _importTranslatorsAvailable(obj, item, false); });