www

commit 18f6a733d050666a6b2129db982e33758ee97b8d
parent ab72119dd0c0f39c544d2b92d99e832c9d6a627f
Author: Simon Kornblith <simon@simonster.com>
Date:   Mon, 11 Jun 2012 00:27:43 -0400

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

Diffstat:
M
chrome/content/zotero/fileInterface.js
 | 
30
+++++++++++++++++-------------

1 file changed, 17 insertions(+), 13 deletions(-)
diff --git 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); 
 		});