www

commit bb0e894c27cb7c2d31bb916fc7a236f0d749b78b
parent 64c8f04644d921d229069c16e37458d2e0b9afe7
Author: Dan Stillman <dstillman@zotero.org>
Date:   Mon, 12 Mar 2012 22:19:04 -0400

Remove extra debug lines when emptying trash

Diffstat:
M
chrome/content/zotero/xpcom/data/items.js
 | 
13
+++++++------

1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/chrome/content/zotero/xpcom/data/items.js b/chrome/content/zotero/xpcom/data/items.js
@@ -493,6 +493,8 @@ Zotero.Items = new function() {
 	 * @param	{Integer}	days	Only delete items deleted more than this many days ago
 	 */
 	this.emptyTrash = function (libraryID, days, limit) {
+		var t = new Date();
+		
 		Zotero.DB.beginTransaction();
 		var deletedIDs = this.getDeleted(libraryID, true, days);
 		if (deletedIDs.length) {
@@ -503,6 +505,11 @@ Zotero.Items = new function() {
 			Zotero.Notifier.trigger('refresh', 'trash', libraryID ? libraryID : 0);
 		}
 		Zotero.DB.commitTransaction();
+		
+		if (deletedIDs.length) {
+			Zotero.debug("Emptied " + deletedIDs.length + " item(s) from trash in " + (new Date() - t) + " ms");
+		}
+		
 		return deletedIDs.length;
 	}
 	
@@ -521,19 +528,13 @@ Zotero.Items = new function() {
 					
 					// TODO: empty group trashes if permissions
 					
-					var d = new Date();
-					
 					// Delete a few items a time
 					//
 					// TODO: increase number after dealing with slow
 					// tag.getLinkedItems() call during deletes
-					Zotero.debug("Auto-emptying items from trash");
 					var num = 10;
 					var deleted = Zotero.Items.emptyTrash(null, days, num);
 					
-					var d2 = new Date();
-					Zotero.debug("Emptied " + deleted + " old items from trash in " + (d2 - d) + " ms");
-					
 					if (!deleted) {
 						_emptyTrashTimer = null;
 						return;