www

commit ab72119dd0c0f39c544d2b92d99e832c9d6a627f
parent ac19b0490ae260ce5f971794fdfd313f4c49c8d2
Author: Simon Kornblith <simon@simonster.com>
Date:   Mon, 11 Jun 2012 00:21:40 -0400

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

Diffstat:
M
chrome/content/zotero/fileInterface.js
 | 
7
++++---
M
defaults/preferences/zotero.js
 | 
2
--

2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/chrome/content/zotero/fileInterface.js b/chrome/content/zotero/fileInterface.js
@@ -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();
 	}
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
@@ -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", "");