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

Merge branch 'no-new-collection-on-import'

Browse source
This commit is contained in:
Simon Kornblith 2012-06-11 00:27:43 -04:00
commit 18f6a733d0
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
chrome/content/zotero/fileInterface.js
View file

@ -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);
});