www

commit 5cbb8de96bac11721e52660d45271de12942f848
parent 6db380b13211d4aad397581cb28785ae03b44c32
Author: Simon Kornblith <simon@simonster.com>
Date:   Fri, 12 Jun 2015 17:06:07 -0400

Re-enable import progress indicator

Diffstat:
M
chrome/content/zotero/fileInterface.js
 | 
4
++--
M
test/tests/fileInterfaceTest.js
 | 
2
+-

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/chrome/content/zotero/fileInterface.js b/chrome/content/zotero/fileInterface.js
@@ -631,10 +631,10 @@ Zotero_File_Interface.Progress = new function() {
 	this.close = close;
 	
 	function show(headline) {
-		//Zotero.showZoteroPaneProgressMeter(headline);
+		Zotero.showZoteroPaneProgressMeter(headline);
 	}
 	
 	function close() {
-		//Zotero.hideZoteroPaneOverlays();
+		Zotero.hideZoteroPaneOverlays();
 	}
 }
diff --git a/test/tests/fileInterfaceTest.js b/test/tests/fileInterfaceTest.js
@@ -1,7 +1,7 @@
 describe("Zotero_File_Interface", function() {
     let win;
     before(function* () {
-        win = yield loadBrowserWindow();
+        win = yield loadZoteroPane();
         yield OS.File.copy(OS.Path.join(getTestDataDirectory().path, "Test Import Translator.js"),
                            OS.Path.join(Zotero.getTranslatorsDirectory().path, "Test Import Translator.js"));
         yield Zotero.Translators.reinit();