Kill extensions.zotero.import.createNewCollection.fromFile and extensions.zotero.import.createNewCollection.fromClipboard preferences.

Imports from file via cog menu now always create a new collection, as before. Imports from clipboard never create a new collection.
This commit is contained in:
Simon Kornblith 2012-06-11 00:20:24 -04:00
parent 68365e2297
commit 57fe0f65ee
2 changed files with 4 additions and 5 deletions

View file

@ -218,10 +218,11 @@ var Zotero_File_Interface = new function() {
file = fp.file;
}
var createNewCollection = createNewCollectionOverride;
var createNewCollection;
if(createNewCollectionOverride === undefined) {
createNewCollection = Zotero.Prefs.get("import.createNewCollection.fromFile");
createNewCollection = true;
} else if(!createNewCollectionOverride) {
createNewCollection = createNewCollectionOverride;
try {
if (!ZoteroPane.collectionsView.editable) {
ZoteroPane.collectionsView.selectLibrary(null);
@ -271,7 +272,7 @@ var Zotero_File_Interface = new function() {
var translate = new Zotero.Translate.Import();
translate.setString(str);
translate.setHandler("translators", function(obj, item) {
_importTranslatorsAvailable(obj, item, Zotero.Prefs.get("import.createNewCollection.fromClipboard"));
_importTranslatorsAvailable(obj, item, false);
});
translators = translate.getTranslators();
}

View file

@ -94,8 +94,6 @@ pref("extensions.zotero.export.bibliographyLocale", '');
pref("extensions.zotero.export.citePaperJournalArticleURL", false);
pref("extensions.zotero.export.displayCharsetOption", false);
pref("extensions.zotero.import.charset", "auto");
pref("extensions.zotero.import.createNewCollection.fromFile", true);
pref("extensions.zotero.import.createNewCollection.fromClipboard", true);
pref("extensions.zotero.import.createNewCollection.fromFileOpenHandler", true);
pref("extensions.zotero.rtfScan.lastInputFile", "");
pref("extensions.zotero.rtfScan.lastOutputFile", "");