www

commit 7107be3cdd062fbda799b7564c109832556810f0
parent b890ef21a9f26c0df054d429dece95f917f14ed0
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sat, 14 Mar 2009 20:19:44 +0000

Fix error opening Zotero pane after tag deletion


Diffstat:
M
chrome/content/zotero/xpcom/data/tag.js
 | 
11
+++++++----

1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/chrome/content/zotero/xpcom/data/tag.js b/chrome/content/zotero/xpcom/data/tag.js
@@ -493,8 +493,9 @@ Zotero.Tag.prototype.erase = function () {
 	
 	Zotero.DB.beginTransaction();
 	
-	var deletedTagNotifierData = {};
-	deletedTagNotifierData[this.id] = { old: this.serialize() };
+	// Deletion done in Zotero.Tags.purge()
+	//var deletedTagNotifierData = {};
+	//deletedTagNotifierData[this.id] = { old: this.serialize() };
 	
 	var sql  = "SELECT itemID FROM itemTags WHERE tagID=?";
 	var linkedItemIDs = Zotero.DB.columnQuery(sql, this.id);
@@ -519,7 +520,8 @@ Zotero.Tag.prototype.erase = function () {
 		itemTags.push(itemID + '-' + this.id);
 	}
 	
-	Zotero.Tags.unload(this.id);
+	// Deletion done in Zotero.Tags.purge()
+	//Zotero.Tags.unload(this.id);
 	
 	Zotero.Notifier.trigger('remove', 'item-tag', itemTags);
 	
@@ -528,7 +530,8 @@ Zotero.Tag.prototype.erase = function () {
 		Zotero.Notifier.trigger('modify', 'item', linkedItems, linkedItemsNotifierData);
 	}
 	
-	Zotero.Notifier.trigger('delete', 'tag', this.id, deletedTagNotifierData);
+	// Deletion done in Zotero.Tags.purge()
+	//Zotero.Notifier.trigger('delete', 'tag', this.id, deletedTagNotifierData);
 	
 	Zotero.DB.commitTransaction();