From 7e808b99979f8343d43c51d80f2e34f9256e38b1 Mon Sep 17 00:00:00 2001
From: aurimasv <aurimas.dev@gmail.com>
Date: Sun, 27 Jan 2013 01:40:02 -0600
Subject: [PATCH 01/16] Tweaks to WebDAV preferences

---
 .../content/zotero/preferences/preferences.xul  | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
index 74ae4daa21..575862bddc 100644
--- a/chrome/content/zotero/preferences/preferences.xul
+++ b/chrome/content/zotero/preferences/preferences.xul
@@ -167,9 +167,9 @@ To add a new preference:
 			<preference id="pref-sync-username" name="extensions.zotero.sync.server.username" type="string" instantApply="true"/>
 			<preference id="pref-storage-enabled" name="extensions.zotero.sync.storage.enabled" type="bool"/>
 			<preference id="pref-storage-protocol" name="extensions.zotero.sync.storage.protocol" type="string" onchange="unverifyStorageServer()"/>
-			<preference id="pref-storage-scheme" name="extensions.zotero.sync.storage.scheme" type="string"/>
-			<preference id="pref-storage-url" name="extensions.zotero.sync.storage.url" type="string" instantApply="true"/>
-			<preference id="pref-storage-username" name="extensions.zotero.sync.storage.username" type="string" instantApply="true"/>
+			<preference id="pref-storage-scheme" name="extensions.zotero.sync.storage.scheme" type="string" instantApply="true"/>
+			<preference id="pref-storage-url" name="extensions.zotero.sync.storage.url" type="string"/>
+			<preference id="pref-storage-username" name="extensions.zotero.sync.storage.username" type="string"/>
 			<preference id="pref-group-storage-enabled" name="extensions.zotero.sync.storage.groups.enabled" type="bool"/>
 		</preferences>
 		
@@ -272,9 +272,8 @@ To add a new preference:
 										<label value="://"/>
 										<textbox id="storage-url" flex="1"
 											preference="pref-storage-url"
-											onkeypress="if (Zotero.isMac &amp;&amp; event.keyCode == 13) { this.blur(); verifyStorageServer(); }"
-											onsynctopreference="unverifyStorageServer();"
-											onchange="this.value = this.value.replace(/(^https?:\/\/|\/zotero\/?$|\/$)/g, '')"/>
+											onkeypress="if (Zotero.isMac &amp;&amp; event.keyCode == 13) { this.blur(); setTimeout(verifyStorageServer, 1); }"
+											onchange="unverifyStorageServer(); this.value = this.value.replace(/(^https?:\/\/|\/zotero\/?$|\/$)/g, ''); Zotero.Prefs.set('extensions.zotero.sync.storage.url', this.value)"/>
 										<label value="/zotero/"/>
 									</hbox>
 								</row>
@@ -284,8 +283,7 @@ To add a new preference:
 										<textbox id="storage-username"
 											preference="pref-storage-username"
 											onkeypress="if (Zotero.isMac &amp;&amp; event.keyCode == 13) { this.blur(); setTimeout(verifyStorageServer, 1); }"
-											onsynctopreference="unverifyStorageServer();"
-											onchange="var pass = document.getElementById('storage-password'); if (pass.value) { Zotero.Sync.Storage.Session.WebDAV.prototype.password = pass.value; }"/>
+											onchange="unverifyStorageServer(); Zotero.Prefs.set('extensions.zotero.sync.storage.username', this.value); var pass = document.getElementById('storage-password'); if (pass.value) { Zotero.Sync.Storage.Session.WebDAV.prototype.password = pass.value; }"/>
 									</hbox>
 								</row>
 								<row>
@@ -293,8 +291,7 @@ To add a new preference:
 									<hbox>
 										<textbox id="storage-password" flex="0" type="password"
 											onkeypress="if (Zotero.isMac &amp;&amp; event.keyCode == 13) { this.blur(); setTimeout(verifyStorageServer, 1); }"
-											oninput="unverifyStorageServer()"
-											onchange="Zotero.Sync.Storage.Session.WebDAV.prototype.password = this.value"/>
+											onchange="unverifyStorageServer(); Zotero.Sync.Storage.Session.WebDAV.prototype.password = this.value"/>
 									</hbox>
 								</row>
 								<row>

From 41de3876d844a2c867456e6bc31d44d8153878f7 Mon Sep 17 00:00:00 2001
From: Aurimas Vinckevicius <aurimas.dev@gmail.com>
Date: Thu, 31 Jan 2013 16:17:53 -0600
Subject: [PATCH 02/16] Fall back to link attachments for opening item

---
 chrome/content/zotero/zoteroPane.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 50e5dfa40c..7c3426ea7e 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -3369,6 +3369,7 @@ var ZoteroPane = new function()
 		
 		for each(var item in items) {
 			if (item.isRegularItem()) {
+				//Prefer physical attachments (not links)
 				var uri = Components.classes["@mozilla.org/network/standard-url;1"]
 							.createInstance(Components.interfaces.nsIURI);
 				var snapID = item.getBestAttachment();
@@ -3383,6 +3384,7 @@ var ZoteroPane = new function()
 					}
 				}
 				
+				//fall back to URI  field then DOI
 				var uri = item.getField('url');
 				if (!uri) {
 					var doi = item.getField('DOI');
@@ -3394,6 +3396,16 @@ var ZoteroPane = new function()
 						}
 					}
 				}
+				
+				//fall back to first link attachment
+				if(!uri) {
+					var link = item.getAttachments()[0];
+					if(link) {
+						link = Zotero.Items.get(link);
+						if(link) uri = link.getField('url');
+					}
+				}
+				
 				if (uri) {
 					ZoteroPane_Local.loadURI(uri, event);
 				}

From 13a2bb99e10e8d56884e0dddd63f1e5faa952c1f Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 31 Jan 2013 17:44:51 -0500
Subject: [PATCH 03/16] Tweak patch from 41de387 to keep file style consistent

---
 chrome/content/zotero/zoteroPane.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 7c3426ea7e..e3da53ce17 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -3369,7 +3369,7 @@ var ZoteroPane = new function()
 		
 		for each(var item in items) {
 			if (item.isRegularItem()) {
-				//Prefer physical attachments (not links)
+				// Prefer local file attachments
 				var uri = Components.classes["@mozilla.org/network/standard-url;1"]
 							.createInstance(Components.interfaces.nsIURI);
 				var snapID = item.getBestAttachment();
@@ -3384,7 +3384,7 @@ var ZoteroPane = new function()
 					}
 				}
 				
-				//fall back to URI  field then DOI
+				// Fall back to URI field, then DOI
 				var uri = item.getField('url');
 				if (!uri) {
 					var doi = item.getField('DOI');
@@ -3397,12 +3397,12 @@ var ZoteroPane = new function()
 					}
 				}
 				
-				//fall back to first link attachment
-				if(!uri) {
+				// Fall back to first attachment link
+				if (!uri) {
 					var link = item.getAttachments()[0];
-					if(link) {
+					if (link) {
 						link = Zotero.Items.get(link);
-						if(link) uri = link.getField('url');
+						if (link) uri = link.getField('url');
 					}
 				}
 				

From eed6d2f22c046fb29547645aebdca4d29bac1a50 Mon Sep 17 00:00:00 2001
From: aurimasv <aurimas.dev@gmail.com>
Date: Sat, 19 Jan 2013 20:05:21 -0600
Subject: [PATCH 04/16] Pass responseCharset to subsequent doGet calls

---
 chrome/content/zotero/xpcom/http.js                | 5 +++--
 chrome/content/zotero/xpcom/utilities_translate.js | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/xpcom/http.js b/chrome/content/zotero/xpcom/http.js
index fc02bd8082..436b308753 100644
--- a/chrome/content/zotero/xpcom/http.js
+++ b/chrome/content/zotero/xpcom/http.js
@@ -576,9 +576,10 @@ Zotero.HTTP = new function() {
 	/**
 	 * Handler for XMLHttpRequest state change
 	 *
-	 * @param {nsIXMLHttpRequest} XMLHttpRequest whose state just changed
-	 * @param {Function} [onDone] Callback for request completion
+	 * @param {nsIXMLHttpRequest} xmlhttp XMLHttpRequest whose state just changed
+	 * @param {Function} [callback] Callback for request completion
 	 * @param {String} [responseCharset] Character set to force on the response
+	 * @param {*} [data] Data to be passed back to callback as the second argument
 	 * @private
 	 */
 	function _stateChange(xmlhttp, callback, responseCharset, data) {
diff --git a/chrome/content/zotero/xpcom/utilities_translate.js b/chrome/content/zotero/xpcom/utilities_translate.js
index 3d1df5a403..300b3a4c9e 100644
--- a/chrome/content/zotero/xpcom/utilities_translate.js
+++ b/chrome/content/zotero/xpcom/utilities_translate.js
@@ -402,7 +402,7 @@ Zotero.Utilities.Translate.prototype.doGet = function(urls, processor, done, res
 			}
 			
 			if(callAgain) {
-				me.doGet(urls, processor, done);
+				me.doGet(urls, processor, done, responseCharset);
 			} else {
 				if(done) {
 					done();

From 6b878ba9f192692f1dcbd6eccc04cc644bebaf27 Mon Sep 17 00:00:00 2001
From: Aurimas Vinckevicius <aurimas.dev@gmail.com>
Date: Thu, 31 Jan 2013 19:50:57 -0600
Subject: [PATCH 05/16] Delete hidden browser even if processDocuments
 exception handler does not fail.

---
 chrome/content/zotero/xpcom/utilities_translate.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/chrome/content/zotero/xpcom/utilities_translate.js b/chrome/content/zotero/xpcom/utilities_translate.js
index 300b3a4c9e..777605604b 100644
--- a/chrome/content/zotero/xpcom/utilities_translate.js
+++ b/chrome/content/zotero/xpcom/utilities_translate.js
@@ -208,14 +208,22 @@ Zotero.Utilities.Translate.prototype.processDocuments = function(urls, processor
 	var translate = this._translate;
 	if(exception) {
 		var myException = function(e) {
+			var browserDeleted;
 			try {
 				exception(e);
 			} catch(e) {
 				try {
 					Zotero.Browser.deleteHiddenBrowser(hiddenBrowser);
 				} catch(e) {}
+				browserDeleted = true;
 				translate.complete(false, e);
 			}
+			
+			if(!browserDeleted) {
+				try {
+					Zotero.Browser.deleteHiddenBrowser(hiddenBrowser);
+				} catch(e) {}
+			}
 		}
 	} else {
 		var myException = function(e) {

From 1a0849e489b4da10ae85e44c3f01de23e604ec85 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 2 Feb 2013 05:31:14 -0500
Subject: [PATCH 06/16] Fix and change extraData for item change notifications

- Some item changes were putting data in the wrong form into extraData,
  which was keeping it from being passed through in notifications.
- For item modifications, set a 'changed' object, keyed by itemID, with
  just the fields that changed as keys and their old values. For
  deletes, keep the 'old' object for now, since sync relies on it.
- Remove item.serialize() for all item changes except deletions, which
  should speed up writes (and which will leave extraData empty for some
  changes).
- Currently only item fields, creators, related items ('related'), and
  'parentItem' are added to 'changed'.

Closes #220
---
 chrome/content/zotero/xpcom/data/item.js | 189 ++++++++++++++---------
 chrome/content/zotero/xpcom/notifier.js  |   8 +-
 2 files changed, 118 insertions(+), 79 deletions(-)

diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js
index b4ca880bd3..c30398ae5e 100644
--- a/chrome/content/zotero/xpcom/data/item.js
+++ b/chrome/content/zotero/xpcom/data/item.js
@@ -64,7 +64,7 @@ Zotero.Item.prototype._init = function () {
 	this._itemDataLoaded = false;
 	this._relatedItemsLoaded = false;
 	
-	this._changed = false;
+	this._changed = {};
 	this._changedPrimaryData = false;
 	this._changedItemData = false;
 	this._changedCreators = false;
@@ -74,7 +74,7 @@ Zotero.Item.prototype._init = function () {
 	this._changedAttachmentData = false;
 	
 	this._skipModTimeUpdate = false;
-	this._previousData = null;
+	this._previousData = {};
 	
 	this._deleted = null;
 	this._noteTitle = null;
@@ -412,7 +412,7 @@ Zotero.Item.prototype.loadFromRow = function(row, reload) {
  * Check if any data fields have changed since last save
  */
 Zotero.Item.prototype.hasChanged = function() {
-	return !!(this._changed
+	return !!(Object.keys(this._changed).length
 		|| this._changedPrimaryData
 		|| this._changedItemData
 		|| this._changedCreators
@@ -554,7 +554,7 @@ Zotero.Item.prototype.setType = function(itemTypeID, loadIn) {
 	
 	if (copiedFields) {
 		for each(var f in copiedFields) {
-			this.setField(f[0], f[1]);
+			this.setField(f[0], f[1], true);
 		}
 	}
 	
@@ -562,6 +562,7 @@ Zotero.Item.prototype.setType = function(itemTypeID, loadIn) {
 		this._itemDataLoaded = false;
 	}
 	else {
+		this._markFieldChange('itemType', Zotero.ItemTypes.getName(oldItemTypeID));
 		if (!this._changedPrimaryData) {
 			this._changedPrimaryData = {};
 		}
@@ -720,10 +721,9 @@ Zotero.Item.prototype.setField = function(field, value, loadIn) {
 		if (this['_' + field] != value) {
 			Zotero.debug("Field '" + field + "' has changed from '" + this['_' + field] + "' to '" + value + "'", 4);
 			
-			// Save a copy of the object before modifying
-			if (this.id && this.exists() && !this._previousData) {
-				this._previousData = this.serialize();
-			}
+			// Save a copy of the field before modifying
+			this._markFieldChange(field, this['_' + field]);
+			
 			if (field == 'itemTypeID') {
 				this.setType(value, loadIn);
 			}
@@ -808,10 +808,10 @@ Zotero.Item.prototype.setField = function(field, value, loadIn) {
 			return false;
 		}
 		
-		// Save a copy of the object before modifying
-		if (this.id && this.exists() && !this._previousData) {
-			this._previousData = this.serialize();
-		}
+		// Save a copy of the field before modifying
+		this._markFieldChange(
+			Zotero.ItemFields.getName(field), this._itemData[fieldID]
+		);
 	}
 	
 	this._itemData[fieldID] = value;
@@ -1052,15 +1052,20 @@ Zotero.Item.prototype.setCreator = function(orderIndex, creator, creatorTypeIDOr
 		return false;
 	}
 	
+	// Save copy of old creators for notifier
+	if (!this._changedCreators) {
+		this._changedCreators = {};
+		
+		var oldCreators = this._getOldCreators()
+		this._markFieldChange('creators', oldCreators);
+	}
+	this._changedCreators[orderIndex] = true;
+	
 	this._creators[orderIndex] = {
 		ref: creator,
 		creatorTypeID: creatorTypeID
 	};
 	
-	if (!this._changedCreators) {
-		this._changedCreators = {};
-	}
-	this._changedCreators[orderIndex] = true;
 	return true;
 }
 
@@ -1083,6 +1088,14 @@ Zotero.Item.prototype.removeCreator = function(orderIndex) {
 		Zotero.Prefs.set('purge.creators', true);
 	}
 	
+	// Save copy of old creators for notifier
+	if (!this._changedCreators) {
+		this._changedCreators = {};
+		
+		var oldCreators = this._getOldCreators();
+		this._markFieldChange('creators', oldCreators);
+	}
+	
 	// Shift creator orderIndexes down, going to length+1 so we clear the last one
 	for (var i=orderIndex, max=this._creators.length+1; i<max; i++) {
 		var next = this._creators[i+1] ? this._creators[i+1] : false;
@@ -1093,9 +1106,6 @@ Zotero.Item.prototype.removeCreator = function(orderIndex) {
 			this._creators.splice(i, 1);
 		}
 		
-		if (!this._changedCreators) {
-			this._changedCreators = {};
-		}
 		this._changedCreators[i] = true;
 	}
 	
@@ -1167,7 +1177,8 @@ Zotero.Item.prototype.addRelatedItem = function (itemID) {
 	}
 	*/
 	
-	this._prepFieldChange('relatedItems');
+	this._markFieldChange('related', current);
+	this._changed.relatedItems = true;
 	this._relatedItems.push(item);
 	return true;
 }
@@ -1189,7 +1200,8 @@ Zotero.Item.prototype.removeRelatedItem = function (itemID) {
 		return false;
 	}
 	
-	this._prepFieldChange('relatedItems');
+	this._markFieldChange('related', current);
+	this._changed.relatedItems = true;
 	this._relatedItems.splice(index, 1);
 	return true;
 }
@@ -1506,9 +1518,7 @@ Zotero.Item.prototype.save = function() {
 				}
 				
 				var newSourceItemNotifierData = {};
-				newSourceItemNotifierData[newSourceItem.id] = {
-					old: newSourceItem.serialize()
-				};
+				//newSourceItemNotifierData[newSourceItem.id] = {};
 				Zotero.Notifier.trigger('modify', 'item', newSourceItem.id, newSourceItemNotifierData);
 				
 				switch (Zotero.ItemTypes.getName(this.itemTypeID)) {
@@ -1528,16 +1538,13 @@ Zotero.Item.prototype.save = function() {
 				var newids = [];
 				var currentIDs = this._getRelatedItems(true);
 				
-				if (this._previousData && this._previousData.related) {
-					for each(var id in this._previousData.related) {
-						if (currentIDs.indexOf(id) == -1) {
-							removed.push(id);
-						}
+				for each(var id in this._previousData.related) {
+					if (currentIDs.indexOf(id) == -1) {
+						removed.push(id);
 					}
 				}
 				for each(var id in currentIDs) {
-					if (this._previousData && this._previousData.related &&
-							this._previousData.related.indexOf(id) != -1) {
+					if (this._previousData.related.indexOf(id) != -1) {
 						continue;
 					}
 					newids.push(id);
@@ -1882,7 +1889,9 @@ Zotero.Item.prototype.save = function() {
 				Zotero.DB.query(sql, bindParams);
 			}
 			
-			Zotero.Notifier.trigger('modify', 'item', this.id, { old: this._previousData });
+			var notifierData = {};
+			notifierData[this.id] = { changed: this._previousData };
+			Zotero.Notifier.trigger('modify', 'item', this.id, notifierData);
 			
 			// Parent
 			if (this._changedSource) {
@@ -1905,22 +1914,16 @@ Zotero.Item.prototype.save = function() {
 					}
 					
 					var newSourceItemNotifierData = {};
-					newSourceItemNotifierData[newSourceItem.id] = {
-						old: newSourceItem.serialize()
-					};
+					//newSourceItemNotifierData[newSourceItem.id] = {};
 					Zotero.Notifier.trigger('modify', 'item', newSourceItem.id, newSourceItemNotifierData);
 				}
 				
-				if (this._previousData) {
-					var oldSourceItemKey = this._previousData.sourceItemKey;
-					if (oldSourceItemKey) {
-						var oldSourceItem = Zotero.Items.getByLibraryAndKey(this.libraryID, oldSourceItemKey);
-					}
+				var oldSourceItemKey = this._previousData.parent;
+				if (oldSourceItemKey) {
+					var oldSourceItem = Zotero.Items.getByLibraryAndKey(this.libraryID, oldSourceItemKey);
 					if (oldSourceItem) {
 						var oldSourceItemNotifierData = {};
-						oldSourceItemNotifierData[oldSourceItem.id] = {
-							old: oldSourceItem.serialize()
-						};
+						//oldSourceItemNotifierData[oldSourceItem.id] = {};
 						Zotero.Notifier.trigger('modify', 'item', oldSourceItem.id, oldSourceItemNotifierData);
 					}
 					else if (oldSourceItemKey) {
@@ -1931,6 +1934,7 @@ Zotero.Item.prototype.save = function() {
 				}
 				
 				
+				
 				// If this was an independent item, remove from any collections
 				// where it existed previously and add source instead if
 				// there is one
@@ -2003,16 +2007,13 @@ Zotero.Item.prototype.save = function() {
 				var newids = [];
 				var currentIDs = this._getRelatedItems(true);
 				
-				if (this._previousData && this._previousData.related) {
-					for each(var id in this._previousData.related) {
-						if (currentIDs.indexOf(id) == -1) {
-							removed.push(id);
-						}
+				for each(var id in this._previousData.related) {
+					if (currentIDs.indexOf(id) == -1) {
+						removed.push(id);
 					}
 				}
 				for each(var id in currentIDs) {
-					if (this._previousData && this._previousData.related &&
-							this._previousData.related.indexOf(id) != -1) {
+					if (this._previousData.related.indexOf(id) != -1) {
 						continue;
 					}
 					newids.push(id);
@@ -2243,12 +2244,9 @@ Zotero.Item.prototype.setSource = function(sourceItemID) {
 		return false;
 	}
 	
-	if (this.id && this.exists() && !this._previousData) {
-		this._previousData = this.serialize();
-	}
-	
-	this._sourceItem = sourceItemID ? parseInt(sourceItemID) : false;
+	this._markFieldChange('parentItem', this.getSourceKey());
 	this._changedSource = true;
+	this._sourceItem = sourceItemID ? parseInt(sourceItemID) : false;
 	
 	return true;
 }
@@ -2280,12 +2278,9 @@ Zotero.Item.prototype.setSourceKey = function(sourceItemKey) {
 		return false;
 	}
 	
-	if (this.id && this.exists() && !this._previousData) {
-		this._previousData = this.serialize();
-	}
-	
-	this._sourceItem = sourceItemKey ? sourceItemKey : false;
+	this._markFieldChange('parentItem', oldSourceItemKey);
 	this._changedSource = true;
+	this._sourceItem = sourceItemKey ? sourceItemKey : false;
 	
 	return true;
 }
@@ -2452,12 +2447,10 @@ Zotero.Item.prototype.setNote = function(text) {
 		return false;
 	}
 	
-	if (this.id && this.exists() && !this._previousData) {
-		this._previousData = this.serialize();
-	}
-	
 	this._noteText = text;
 	this._noteTitle = Zotero.Notes.noteToTitle(text);
+	
+	this._markFieldChange('note', oldText);
 	this._changedNote = true;
 	
 	return true;
@@ -4096,7 +4089,7 @@ Zotero.Item.prototype.erase = function() {
 		var sourceItemID = Zotero.DB.valueQuery(sql);
 		if (sourceItemID) {
 			var sourceItem = Zotero.Items.get(sourceItemID);
-			changedItemsNotifierData[sourceItem.id] = { old: sourceItem.serialize() };
+			//changedItemsNotifierData[sourceItem.id] = {};
 			if (!this.deleted) {
 				sourceItem.decrementNoteCount();
 			}
@@ -4110,7 +4103,7 @@ Zotero.Item.prototype.erase = function() {
 		var sourceItemID = Zotero.DB.valueQuery(sql);
 		if (sourceItemID) {
 			var sourceItem = Zotero.Items.get(sourceItemID);
-			changedItemsNotifierData[sourceItem.id] = { old: sourceItem.serialize() };
+			//changedItemsNotifierData[sourceItem.id] = {};
 			if (!this.deleted) {
 				sourceItem.decrementAttachmentCount();
 			}
@@ -4157,7 +4150,7 @@ Zotero.Item.prototype.erase = function() {
 	for each(var id in relateds) {
 		var relatedItem = Zotero.Items.get(id);
 		if (changedItems.indexOf(id) != -1) {
-			changedItemsNotifierData[id] = { old: relatedItem.serialize() };
+			//changedItemsNotifierData[id] = {};
 			changedItems.push(id);
 		}
 	}
@@ -4753,7 +4746,8 @@ Zotero.Item.prototype._setRelatedItems = function (itemIDs) {
 	
 	// Mark as changed if new or removed ids
 	if (newIDs.length > 0 || oldIDs.length != currentIDs.length) {
-		this._prepFieldChange('relatedItems');
+		this._markFieldChange('related', currentIDs);
+		this._changed.relatedItems = true
 	}
 	else {
 		Zotero.debug('Related items not changed in Zotero.Item._setRelatedItems()', 4);
@@ -4769,17 +4763,58 @@ Zotero.Item.prototype._setRelatedItems = function (itemIDs) {
 }
 
 
-// TODO: use for stuff other than related items
-Zotero.Item.prototype._prepFieldChange = function (field) {
-	if (!this._changed) {
-		this._changed = {};
+/**
+ * The creator has already been changed in itembox.xml before being passed
+ * to setCreator()/removeCreator(), so we have to reach in and get its
+ * previousData, and ideally try to detect when this private data structure
+ * has changed, which it almost certainly will. I am so sorry.
+ */
+Zotero.Item.prototype._getOldCreators = function () {
+	var oldCreators = [];
+	for (var i in this._creators) {
+		if (this._creators[i].ref._changed) {
+			if (!this._creators[i].ref._previousData
+					&& !this._creators[i].ref._previousData.fields) {
+				Components.utils.reportError("Previous creator data not available in expected form");
+				oldCreators.push(false);
+				continue;
+			}
+			var c = this._creators[i].ref._previousData.fields;
+		}
+		else {
+			var c = this._creators[i].ref;
+		}
+		
+		var old = {
+			// Convert creatorTypeIDs to text
+			creatorType: Zotero.CreatorTypes.getName(
+				this._creators[i].creatorTypeID
+			)
+		};
+		
+		if (c.fieldMode) {
+			// In 'fields' there's just 'name' for single-field mode
+			old.name = typeof c.name == 'undefined' ? c.lastName : c.name;
+		}
+		else {
+			old.firstName = c.firstName;
+			old.lastName = c.lastName;
+		}
+		oldCreators.push(old);
 	}
-	this._changed[field] = true;
-	
-	// Save a copy of the data before changing
-	if (this.id && this.exists() && !this._previousData) {
-		this._previousData = this.serialize();
+	return oldCreators;
+}
+
+
+/**
+ * Save old version of data that's being changed, to pass to the notifier
+ */
+Zotero.Item.prototype._markFieldChange = function (field, oldValue) {
+	// Only save if item already exists and field not already changed
+	if (!this.id || !this.exists() || this._previousData[field]) {
+		return;
 	}
+	this._previousData[field] = oldValue;
 }
 
 
diff --git a/chrome/content/zotero/xpcom/notifier.js b/chrome/content/zotero/xpcom/notifier.js
index 01cda49652..27b3bfa8ae 100644
--- a/chrome/content/zotero/xpcom/notifier.js
+++ b/chrome/content/zotero/xpcom/notifier.js
@@ -136,7 +136,9 @@ Zotero.Notifier = new function(){
 			// Merge extraData keys
 			if (extraData) {
 				for (var dataID in extraData) {
-					_queue[type][event].data[dataID] = extraData[dataID];
+					if (extraData[dataID]) {
+						_queue[type][event].data[dataID] = extraData[dataID];
+					}
 				}
 			}
 			
@@ -271,7 +273,9 @@ Zotero.Notifier = new function(){
 					
 					if (runQueue[type][event].ids.indexOf(id) == -1) {
 						runQueue[type][event].ids.push(id);
-						runQueue[type][event].data[id] = data;
+						if (data) {
+							runQueue[type][event].data[id] = data;
+						}
 					}
 				}
 				

From f0ad2510975a9e39e974e356f216ccc3ae5d64f0 Mon Sep 17 00:00:00 2001
From: gracile-fr <gracile@gmx.com>
Date: Sat, 2 Feb 2013 15:31:41 +0100
Subject: [PATCH 07/16] Localization of hardcoded "Quick Format Citation"
 dialog title

---
 chrome/content/zotero/integration/quickFormat.xul | 2 +-
 chrome/locale/af-ZA/zotero/zotero.dtd             | 1 +
 chrome/locale/ar/zotero/zotero.dtd                | 1 +
 chrome/locale/bg-BG/zotero/zotero.dtd             | 1 +
 chrome/locale/ca-AD/zotero/zotero.dtd             | 1 +
 chrome/locale/cs-CZ/zotero/zotero.dtd             | 1 +
 chrome/locale/da-DK/zotero/zotero.dtd             | 1 +
 chrome/locale/de/zotero/zotero.dtd                | 1 +
 chrome/locale/el-GR/zotero/zotero.dtd             | 1 +
 chrome/locale/en-US/zotero/zotero.dtd             | 1 +
 chrome/locale/es-ES/zotero/zotero.dtd             | 1 +
 chrome/locale/et-EE/zotero/zotero.dtd             | 1 +
 chrome/locale/eu-ES/zotero/zotero.dtd             | 1 +
 chrome/locale/fa/zotero/zotero.dtd                | 1 +
 chrome/locale/fi-FI/zotero/zotero.dtd             | 1 +
 chrome/locale/fr-FR/zotero/zotero.dtd             | 1 +
 chrome/locale/gl-ES/zotero/zotero.dtd             | 1 +
 chrome/locale/he-IL/zotero/zotero.dtd             | 1 +
 chrome/locale/hr-HR/zotero/zotero.dtd             | 1 +
 chrome/locale/hu-HU/zotero/zotero.dtd             | 1 +
 chrome/locale/is-IS/zotero/zotero.dtd             | 1 +
 chrome/locale/it-IT/zotero/zotero.dtd             | 1 +
 chrome/locale/ja-JP/zotero/zotero.dtd             | 1 +
 chrome/locale/km/zotero/zotero.dtd                | 1 +
 chrome/locale/ko-KR/zotero/zotero.dtd             | 1 +
 chrome/locale/mn-MN/zotero/zotero.dtd             | 1 +
 chrome/locale/nb-NO/zotero/zotero.dtd             | 1 +
 chrome/locale/nl-NL/zotero/zotero.dtd             | 1 +
 chrome/locale/nn-NO/zotero/zotero.dtd             | 1 +
 chrome/locale/pl-PL/zotero/zotero.dtd             | 1 +
 chrome/locale/pt-BR/zotero/zotero.dtd             | 1 +
 chrome/locale/pt-PT/zotero/zotero.dtd             | 1 +
 chrome/locale/ro-RO/zotero/zotero.dtd             | 1 +
 chrome/locale/ru-RU/zotero/zotero.dtd             | 1 +
 chrome/locale/sk-SK/zotero/zotero.dtd             | 1 +
 chrome/locale/sl-SI/zotero/zotero.dtd             | 1 +
 chrome/locale/sr-RS/zotero/zotero.dtd             | 1 +
 chrome/locale/sv-SE/zotero/zotero.dtd             | 1 +
 chrome/locale/th-TH/zotero/zotero.dtd             | 1 +
 chrome/locale/tr-TR/zotero/zotero.dtd             | 1 +
 chrome/locale/vi-VN/zotero/zotero.dtd             | 1 +
 chrome/locale/zh-CN/zotero/zotero.dtd             | 1 +
 chrome/locale/zh-TW/zotero/zotero.dtd             | 1 +
 43 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/integration/quickFormat.xul b/chrome/content/zotero/integration/quickFormat.xul
index ab87011409..532e283c9b 100644
--- a/chrome/content/zotero/integration/quickFormat.xul
+++ b/chrome/content/zotero/integration/quickFormat.xul
@@ -33,7 +33,7 @@
 <window
 	id="quick-format-dialog"
 	orient="vertical"
-	title="Quick Format Citation"
+	title="&zotero.integration.quickFormatDialog.title;"
 	width="600" 
 	xmlns:html="http://www.w3.org/1999/xhtml"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/chrome/locale/af-ZA/zotero/zotero.dtd b/chrome/locale/af-ZA/zotero/zotero.dtd
index bdbb88e19f..3cfc144598 100644
--- a/chrome/locale/af-ZA/zotero/zotero.dtd
+++ b/chrome/locale/af-ZA/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Dokumentvoorkeure">
 <!ENTITY zotero.integration.addEditCitation.title "Voeg by/redigeer aanhaling">
 <!ENTITY zotero.integration.editBibliography.title "Redigeer bronnelys">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Vordering">
 
diff --git a/chrome/locale/ar/zotero/zotero.dtd b/chrome/locale/ar/zotero/zotero.dtd
index e14ac5a5bd..05ae5244bd 100644
--- a/chrome/locale/ar/zotero/zotero.dtd
+++ b/chrome/locale/ar/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "تفضيلات المستند">
 <!ENTITY zotero.integration.addEditCitation.title "اضافة/تحرير استشهاد مرجعي">
 <!ENTITY zotero.integration.editBibliography.title "تحرير ببليوجرافية">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "التقدم">
 
diff --git a/chrome/locale/bg-BG/zotero/zotero.dtd b/chrome/locale/bg-BG/zotero/zotero.dtd
index 6414aa8ff0..d736c9d10c 100644
--- a/chrome/locale/bg-BG/zotero/zotero.dtd
+++ b/chrome/locale/bg-BG/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Настройки на докумета">
 <!ENTITY zotero.integration.addEditCitation.title "Добавя/редактира на цитат">
 <!ENTITY zotero.integration.editBibliography.title "Редактира на библиографията">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Напредък">
 
diff --git a/chrome/locale/ca-AD/zotero/zotero.dtd b/chrome/locale/ca-AD/zotero/zotero.dtd
index b0c2ab386a..55156bd42a 100644
--- a/chrome/locale/ca-AD/zotero/zotero.dtd
+++ b/chrome/locale/ca-AD/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Preferències del document">
 <!ENTITY zotero.integration.addEditCitation.title "Afegeix/Edita cita">
 <!ENTITY zotero.integration.editBibliography.title "Edita bibliografia">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Progrés">
 
diff --git a/chrome/locale/cs-CZ/zotero/zotero.dtd b/chrome/locale/cs-CZ/zotero/zotero.dtd
index adf9011e0a..3697c04cb2 100644
--- a/chrome/locale/cs-CZ/zotero/zotero.dtd
+++ b/chrome/locale/cs-CZ/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Vlastnosti dokumentu">
 <!ENTITY zotero.integration.addEditCitation.title "Přidat/Upravit citaci">
 <!ENTITY zotero.integration.editBibliography.title "Upravit bibliografii">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Postup">
 
diff --git a/chrome/locale/da-DK/zotero/zotero.dtd b/chrome/locale/da-DK/zotero/zotero.dtd
index 7fe70e7904..7ab6b1ef59 100644
--- a/chrome/locale/da-DK/zotero/zotero.dtd
+++ b/chrome/locale/da-DK/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Dokumentindstillinger">
 <!ENTITY zotero.integration.addEditCitation.title "Tilføj/rediger reference">
 <!ENTITY zotero.integration.editBibliography.title "Rediger referenceliste">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Fremgang">
 
diff --git a/chrome/locale/de/zotero/zotero.dtd b/chrome/locale/de/zotero/zotero.dtd
index 99992581d1..358b271f90 100644
--- a/chrome/locale/de/zotero/zotero.dtd
+++ b/chrome/locale/de/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Dokument-Eigenschaften">
 <!ENTITY zotero.integration.addEditCitation.title "Zitation hinzufügen/ändern">
 <!ENTITY zotero.integration.editBibliography.title "Literaturverzeichnis editieren">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Fortschritt">
 
diff --git a/chrome/locale/el-GR/zotero/zotero.dtd b/chrome/locale/el-GR/zotero/zotero.dtd
index 3a7956859b..1ca5540ce3 100644
--- a/chrome/locale/el-GR/zotero/zotero.dtd
+++ b/chrome/locale/el-GR/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Document Preferences">
 <!ENTITY zotero.integration.addEditCitation.title "Add/Edit Citation">
 <!ENTITY zotero.integration.editBibliography.title "Edit Bibliography">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Progress">
 
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index a77b5088bb..fd14ea4949 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title				"Document Preferences">
 <!ENTITY zotero.integration.addEditCitation.title		"Add/Edit Citation">
 <!ENTITY zotero.integration.editBibliography.title		"Edit Bibliography">
+<!ENTITY zotero.integration.quickFormatDialog.title		"Quick Format Citation">
 
 <!ENTITY zotero.progress.title							"Progress">
 
diff --git a/chrome/locale/es-ES/zotero/zotero.dtd b/chrome/locale/es-ES/zotero/zotero.dtd
index 10b4c05e4d..5c4813778b 100644
--- a/chrome/locale/es-ES/zotero/zotero.dtd
+++ b/chrome/locale/es-ES/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Ajustes de documento">
 <!ENTITY zotero.integration.addEditCitation.title "Añadir o modificar cita">
 <!ENTITY zotero.integration.editBibliography.title "Modificar bibliografía">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Progreso">
 
diff --git a/chrome/locale/et-EE/zotero/zotero.dtd b/chrome/locale/et-EE/zotero/zotero.dtd
index 954a575de7..12dc711a37 100644
--- a/chrome/locale/et-EE/zotero/zotero.dtd
+++ b/chrome/locale/et-EE/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Dokumendi sätted">
 <!ENTITY zotero.integration.addEditCitation.title "Lisa/toimeta viidet">
 <!ENTITY zotero.integration.editBibliography.title "Toimeta bibliograafiat">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Progress">
 
diff --git a/chrome/locale/eu-ES/zotero/zotero.dtd b/chrome/locale/eu-ES/zotero/zotero.dtd
index 548c3ab9d9..37bbefc574 100644
--- a/chrome/locale/eu-ES/zotero/zotero.dtd
+++ b/chrome/locale/eu-ES/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Dokumentu honetako ezaugarriak">
 <!ENTITY zotero.integration.addEditCitation.title "Erreferentzia gehitu/editatu">
 <!ENTITY zotero.integration.editBibliography.title "Bibliografia editatu">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Aurrerapena">
 
diff --git a/chrome/locale/fa/zotero/zotero.dtd b/chrome/locale/fa/zotero/zotero.dtd
index c9e67d29cd..80752ea90f 100644
--- a/chrome/locale/fa/zotero/zotero.dtd
+++ b/chrome/locale/fa/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "تنظیمات سند">
 <!ENTITY zotero.integration.addEditCitation.title "افزودن/ویرایش یادکرد">
 <!ENTITY zotero.integration.editBibliography.title "ویرایش کتابنامه">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "پیشرفت">
 
diff --git a/chrome/locale/fi-FI/zotero/zotero.dtd b/chrome/locale/fi-FI/zotero/zotero.dtd
index 0be971f75e..ed8beeb54d 100644
--- a/chrome/locale/fi-FI/zotero/zotero.dtd
+++ b/chrome/locale/fi-FI/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Asiakirjan asetukset">
 <!ENTITY zotero.integration.addEditCitation.title "Lisää/muokkaa sitaatti">
 <!ENTITY zotero.integration.editBibliography.title "Muokkaa lähdeluetteloa">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Eteneminen">
 
diff --git a/chrome/locale/fr-FR/zotero/zotero.dtd b/chrome/locale/fr-FR/zotero/zotero.dtd
index cf2407100a..da3cfe4d10 100644
--- a/chrome/locale/fr-FR/zotero/zotero.dtd
+++ b/chrome/locale/fr-FR/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Préférences du document">
 <!ENTITY zotero.integration.addEditCitation.title "Ajouter/Modifier la citation">
 <!ENTITY zotero.integration.editBibliography.title "Modifier la bibliographie">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Progression">
 
diff --git a/chrome/locale/gl-ES/zotero/zotero.dtd b/chrome/locale/gl-ES/zotero/zotero.dtd
index ddd6f7463c..7987617951 100644
--- a/chrome/locale/gl-ES/zotero/zotero.dtd
+++ b/chrome/locale/gl-ES/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Preferencias do Documento">
 <!ENTITY zotero.integration.addEditCitation.title "Engadir/Editar Cita">
 <!ENTITY zotero.integration.editBibliography.title "Editar Bibliografía">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Progreso">
 
diff --git a/chrome/locale/he-IL/zotero/zotero.dtd b/chrome/locale/he-IL/zotero/zotero.dtd
index b76613edd7..2b7259663e 100644
--- a/chrome/locale/he-IL/zotero/zotero.dtd
+++ b/chrome/locale/he-IL/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Document Preferences">
 <!ENTITY zotero.integration.addEditCitation.title "Add/Edit Citation">
 <!ENTITY zotero.integration.editBibliography.title "ערוך ביבליוגרפיה">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Progress">
 
diff --git a/chrome/locale/hr-HR/zotero/zotero.dtd b/chrome/locale/hr-HR/zotero/zotero.dtd
index 3a7956859b..1ca5540ce3 100644
--- a/chrome/locale/hr-HR/zotero/zotero.dtd
+++ b/chrome/locale/hr-HR/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Document Preferences">
 <!ENTITY zotero.integration.addEditCitation.title "Add/Edit Citation">
 <!ENTITY zotero.integration.editBibliography.title "Edit Bibliography">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Progress">
 
diff --git a/chrome/locale/hu-HU/zotero/zotero.dtd b/chrome/locale/hu-HU/zotero/zotero.dtd
index 12f5440c8a..bbe60d0f9a 100644
--- a/chrome/locale/hu-HU/zotero/zotero.dtd
+++ b/chrome/locale/hu-HU/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Dokumentum beállításai">
 <!ENTITY zotero.integration.addEditCitation.title "Hivatkozás hozzáadása/szerkesztése">
 <!ENTITY zotero.integration.editBibliography.title "Bibliográfia szerkesztése">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Folyamatban">
 
diff --git a/chrome/locale/is-IS/zotero/zotero.dtd b/chrome/locale/is-IS/zotero/zotero.dtd
index d9724db295..eb4392e265 100644
--- a/chrome/locale/is-IS/zotero/zotero.dtd
+++ b/chrome/locale/is-IS/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Document Preferences">
 <!ENTITY zotero.integration.addEditCitation.title "Add/Edit Citation">
 <!ENTITY zotero.integration.editBibliography.title "Edit Bibliography">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Progress">
 
diff --git a/chrome/locale/it-IT/zotero/zotero.dtd b/chrome/locale/it-IT/zotero/zotero.dtd
index baf98dc854..2d46ab2447 100644
--- a/chrome/locale/it-IT/zotero/zotero.dtd
+++ b/chrome/locale/it-IT/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Impostazioni documento">
 <!ENTITY zotero.integration.addEditCitation.title "Aggiungi o modifica citazione">
 <!ENTITY zotero.integration.editBibliography.title "Modifica bibliografia">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Avanzamento">
 
diff --git a/chrome/locale/ja-JP/zotero/zotero.dtd b/chrome/locale/ja-JP/zotero/zotero.dtd
index d73bdab528..8a01bb8c04 100644
--- a/chrome/locale/ja-JP/zotero/zotero.dtd
+++ b/chrome/locale/ja-JP/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "ドキュメントの設定">
 <!ENTITY zotero.integration.addEditCitation.title "出典表記を追加・編集">
 <!ENTITY zotero.integration.editBibliography.title "参考文献目録を編集">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "進行">
 
diff --git a/chrome/locale/km/zotero/zotero.dtd b/chrome/locale/km/zotero/zotero.dtd
index 4fe18f8dda..741a204288 100644
--- a/chrome/locale/km/zotero/zotero.dtd
+++ b/chrome/locale/km/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "ជម្រើសរចនាបថសម្រាប់យោងឯកសារ">
 <!ENTITY zotero.integration.addEditCitation.title "បន្ថែម ឬ កែតម្រូវអាគតដ្ឋាន">
 <!ENTITY zotero.integration.editBibliography.title "កែតម្រូវគន្ថនិទេ្ទស">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "កំពុងដំណើរ">
 
diff --git a/chrome/locale/ko-KR/zotero/zotero.dtd b/chrome/locale/ko-KR/zotero/zotero.dtd
index 298f50318e..5bbc7c4ccf 100644
--- a/chrome/locale/ko-KR/zotero/zotero.dtd
+++ b/chrome/locale/ko-KR/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "문서 환경설정">
 <!ENTITY zotero.integration.addEditCitation.title "인용 추가/편집">
 <!ENTITY zotero.integration.editBibliography.title "참고문헌 목록 편집">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "진행">
 
diff --git a/chrome/locale/mn-MN/zotero/zotero.dtd b/chrome/locale/mn-MN/zotero/zotero.dtd
index 3d9f4c2dff..108f6cdc12 100644
--- a/chrome/locale/mn-MN/zotero/zotero.dtd
+++ b/chrome/locale/mn-MN/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Document Preferences">
 <!ENTITY zotero.integration.addEditCitation.title "Add/Edit Citation">
 <!ENTITY zotero.integration.editBibliography.title "Edit Bibliography">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Progress">
 
diff --git a/chrome/locale/nb-NO/zotero/zotero.dtd b/chrome/locale/nb-NO/zotero/zotero.dtd
index 65468d218a..d1e5ed55ad 100644
--- a/chrome/locale/nb-NO/zotero/zotero.dtd
+++ b/chrome/locale/nb-NO/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Dokumentegenskaper">
 <!ENTITY zotero.integration.addEditCitation.title "Legg til/endre henvisning">
 <!ENTITY zotero.integration.editBibliography.title "Rediger bibliografi">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Framgang">
 
diff --git a/chrome/locale/nl-NL/zotero/zotero.dtd b/chrome/locale/nl-NL/zotero/zotero.dtd
index 59505e3f10..aa04b2f9e1 100644
--- a/chrome/locale/nl-NL/zotero/zotero.dtd
+++ b/chrome/locale/nl-NL/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Documentvoorkeuren">
 <!ENTITY zotero.integration.addEditCitation.title "Verwijzing toevoegen/aanpassen">
 <!ENTITY zotero.integration.editBibliography.title "Bibliografie aanpassen">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Voortgang">
 
diff --git a/chrome/locale/nn-NO/zotero/zotero.dtd b/chrome/locale/nn-NO/zotero/zotero.dtd
index ba144f3177..fe12fc4301 100644
--- a/chrome/locale/nn-NO/zotero/zotero.dtd
+++ b/chrome/locale/nn-NO/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Dokumenteigenskapar">
 <!ENTITY zotero.integration.addEditCitation.title "Legg til/endra henvisning">
 <!ENTITY zotero.integration.editBibliography.title "Rediger bibliografi">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Framgang">
 
diff --git a/chrome/locale/pl-PL/zotero/zotero.dtd b/chrome/locale/pl-PL/zotero/zotero.dtd
index 954845ac02..65ac0881a4 100644
--- a/chrome/locale/pl-PL/zotero/zotero.dtd
+++ b/chrome/locale/pl-PL/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Ustawienia dokumentu">
 <!ENTITY zotero.integration.addEditCitation.title "Dodaj/Edytuj odnośnik bibliograficzny">
 <!ENTITY zotero.integration.editBibliography.title "Edytuj bibliografię">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Postęp">
 
diff --git a/chrome/locale/pt-BR/zotero/zotero.dtd b/chrome/locale/pt-BR/zotero/zotero.dtd
index e7a38e0652..f619b9317f 100644
--- a/chrome/locale/pt-BR/zotero/zotero.dtd
+++ b/chrome/locale/pt-BR/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Preferências do documento">
 <!ENTITY zotero.integration.addEditCitation.title "Adicionar/Modificar citação">
 <!ENTITY zotero.integration.editBibliography.title "Editar bibliografia">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Progresso">
 
diff --git a/chrome/locale/pt-PT/zotero/zotero.dtd b/chrome/locale/pt-PT/zotero/zotero.dtd
index 526d499af3..4696901a11 100644
--- a/chrome/locale/pt-PT/zotero/zotero.dtd
+++ b/chrome/locale/pt-PT/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Preferências do Documento">
 <!ENTITY zotero.integration.addEditCitation.title "Adicionar/Editar Citação">
 <!ENTITY zotero.integration.editBibliography.title "Editar Bibliografia">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Progresso">
 
diff --git a/chrome/locale/ro-RO/zotero/zotero.dtd b/chrome/locale/ro-RO/zotero/zotero.dtd
index fd118d7287..55cf81e0e0 100644
--- a/chrome/locale/ro-RO/zotero/zotero.dtd
+++ b/chrome/locale/ro-RO/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Preferințe document">
 <!ENTITY zotero.integration.addEditCitation.title "Adaugă/Editează citarea">
 <!ENTITY zotero.integration.editBibliography.title "Editează bibliografia">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Progres">
 
diff --git a/chrome/locale/ru-RU/zotero/zotero.dtd b/chrome/locale/ru-RU/zotero/zotero.dtd
index adefad79b1..ccbc3b6d33 100644
--- a/chrome/locale/ru-RU/zotero/zotero.dtd
+++ b/chrome/locale/ru-RU/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Параметры документа">
 <!ENTITY zotero.integration.addEditCitation.title "Добавить/редактировать цитату">
 <!ENTITY zotero.integration.editBibliography.title "Редактировать библиографию">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Ход выполнения">
 
diff --git a/chrome/locale/sk-SK/zotero/zotero.dtd b/chrome/locale/sk-SK/zotero/zotero.dtd
index 23fc8296dd..b4be916c10 100644
--- a/chrome/locale/sk-SK/zotero/zotero.dtd
+++ b/chrome/locale/sk-SK/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Vlastnosti dokumentu">
 <!ENTITY zotero.integration.addEditCitation.title "Pridať/Upraviť citáciu">
 <!ENTITY zotero.integration.editBibliography.title "Upraviť bibliografiu">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Postup">
 
diff --git a/chrome/locale/sl-SI/zotero/zotero.dtd b/chrome/locale/sl-SI/zotero/zotero.dtd
index e14b2134c5..0664f45c8c 100644
--- a/chrome/locale/sl-SI/zotero/zotero.dtd
+++ b/chrome/locale/sl-SI/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Lastnosti dokumenta">
 <!ENTITY zotero.integration.addEditCitation.title "Dodaj/uredi navedek">
 <!ENTITY zotero.integration.editBibliography.title "Uredi bibliografijo">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Napredek">
 
diff --git a/chrome/locale/sr-RS/zotero/zotero.dtd b/chrome/locale/sr-RS/zotero/zotero.dtd
index 35b9fd6b17..f729094d50 100644
--- a/chrome/locale/sr-RS/zotero/zotero.dtd
+++ b/chrome/locale/sr-RS/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Поставке документа">
 <!ENTITY zotero.integration.addEditCitation.title "Додај/уреди цитације">
 <!ENTITY zotero.integration.editBibliography.title "Уреди библиографију">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Напредак">
 
diff --git a/chrome/locale/sv-SE/zotero/zotero.dtd b/chrome/locale/sv-SE/zotero/zotero.dtd
index 4c4ecff6fd..9c58ea649e 100644
--- a/chrome/locale/sv-SE/zotero/zotero.dtd
+++ b/chrome/locale/sv-SE/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Dokumentinställningar">
 <!ENTITY zotero.integration.addEditCitation.title "Lägg till/redigera källhänvisning">
 <!ENTITY zotero.integration.editBibliography.title "Redigera källförteckning">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Förlopp">
 
diff --git a/chrome/locale/th-TH/zotero/zotero.dtd b/chrome/locale/th-TH/zotero/zotero.dtd
index e737ce4e33..6288d1f27b 100644
--- a/chrome/locale/th-TH/zotero/zotero.dtd
+++ b/chrome/locale/th-TH/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "ค่าตั้งพึงใจเกี่ยวกับแฟ้มเอกสาร">
 <!ENTITY zotero.integration.addEditCitation.title "เพิ่ม/แก้ไขการอ้างอิง">
 <!ENTITY zotero.integration.editBibliography.title "แก้ไขบรรณานุกรม">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "ความคืบหน้า">
 
diff --git a/chrome/locale/tr-TR/zotero/zotero.dtd b/chrome/locale/tr-TR/zotero/zotero.dtd
index 99a7207db7..70b5c953fb 100644
--- a/chrome/locale/tr-TR/zotero/zotero.dtd
+++ b/chrome/locale/tr-TR/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Döküman Tercihleri">
 <!ENTITY zotero.integration.addEditCitation.title "Gönderme Ekle/Düzenle">
 <!ENTITY zotero.integration.editBibliography.title "Kaynakça Düzenle">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "İşlem">
 
diff --git a/chrome/locale/vi-VN/zotero/zotero.dtd b/chrome/locale/vi-VN/zotero/zotero.dtd
index c8574be2d1..f6e4e17a4b 100644
--- a/chrome/locale/vi-VN/zotero/zotero.dtd
+++ b/chrome/locale/vi-VN/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Các tùy chọn về Tài liệu">
 <!ENTITY zotero.integration.addEditCitation.title "Thêm/Soạn thảo Trích dẫn">
 <!ENTITY zotero.integration.editBibliography.title "Soạn thảo Thư tịch">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "Tiến triển">
 
diff --git a/chrome/locale/zh-CN/zotero/zotero.dtd b/chrome/locale/zh-CN/zotero/zotero.dtd
index a71ae50f12..4b6545e998 100644
--- a/chrome/locale/zh-CN/zotero/zotero.dtd
+++ b/chrome/locale/zh-CN/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "文档选项">
 <!ENTITY zotero.integration.addEditCitation.title "添加/编辑引文">
 <!ENTITY zotero.integration.editBibliography.title "编辑文献目录">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "进度">
 
diff --git a/chrome/locale/zh-TW/zotero/zotero.dtd b/chrome/locale/zh-TW/zotero/zotero.dtd
index 56b331d95e..483365faf3 100644
--- a/chrome/locale/zh-TW/zotero/zotero.dtd
+++ b/chrome/locale/zh-TW/zotero/zotero.dtd
@@ -144,6 +144,7 @@
 <!ENTITY zotero.integration.docPrefs.title "文件的偏好設定">
 <!ENTITY zotero.integration.addEditCitation.title "新增／編輯引用文獻">
 <!ENTITY zotero.integration.editBibliography.title "編輯參考書目">
+<!ENTITY zotero.integration.quickFormatDialog.title			"Quick Format Citation">
 
 <!ENTITY zotero.progress.title "進度">
 

From 190fe8ba05cc15ce8f92372696f797035a3b6c24 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 3 Feb 2013 02:46:09 -0500
Subject: [PATCH 08/16] Don't leak a hidden browser for every single imported
 text/HTML file

It is possible we have been doing this for a very long time.

(Only local imports were affected, not snapshot saving.)
---
 chrome/content/zotero/xpcom/attachments.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/chrome/content/zotero/xpcom/attachments.js b/chrome/content/zotero/xpcom/attachments.js
index f9acbf5e8e..e226593509 100644
--- a/chrome/content/zotero/xpcom/attachments.js
+++ b/chrome/content/zotero/xpcom/attachments.js
@@ -1345,6 +1345,7 @@ Zotero.Attachments = new function(){
 				// Chain fulltext indexer inside the charset callback,
 				// since it's asynchronous and a prerequisite
 				Zotero.Fulltext.indexDocument(browser.contentDocument, itemID);
+				Zotero.Browser.deleteHiddenBrowser(browser);
 			}
 			
 			// Since the callback can be called during an import process that uses

From 2a0c95d0adcfd19d7deafc912c5152947c38d6e2 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 3 Feb 2013 06:10:58 -0500
Subject: [PATCH 09/16] Cache list of an item's child attachments/notes

---
 chrome/content/zotero/xpcom/data/item.js | 78 +++++++++++++++++++++++-
 1 file changed, 75 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js
index c30398ae5e..42d8341918 100644
--- a/chrome/content/zotero/xpcom/data/item.js
+++ b/chrome/content/zotero/xpcom/data/item.js
@@ -80,6 +80,8 @@ Zotero.Item.prototype._init = function () {
 	this._noteTitle = null;
 	this._noteText = null;
 	this._noteAccessTime = null;
+	this._cachedAttachments = null;
+	this._cachedNotes = null;
 	
 	this._attachmentLinkMode = null;
 	this._attachmentMIMEType = null;
@@ -1862,6 +1864,13 @@ Zotero.Item.prototype.save = function() {
 					];
 				}
 				Zotero.DB.query(sql, bindParams);
+				
+				// Clear cached child notes of the parent. If the note
+				// moved between parents, the old one will be cleared
+				// when changing the note count below
+				if (parent) {
+					Zotero.Items.get(parent).clearCachedNotes();
+				}
 			}
 			
 			
@@ -1887,6 +1896,13 @@ Zotero.Item.prototype.save = function() {
 					this.id
 				];
 				Zotero.DB.query(sql, bindParams);
+				
+				// Clear cached child attachments of the parent. If the note
+				// moved between parents, the old one will be cleared
+				// when changing the note count below
+				if (parent) {
+					Zotero.Items.get(parent).clearCachedAttachments();
+				}
 			}
 			
 			var notifierData = {};
@@ -2293,11 +2309,18 @@ Zotero.Item.prototype.setSourceKey = function(sourceItemKey) {
 ////////////////////////////////////////////////////////
 Zotero.Item.prototype.incrementNoteCount = function() {
 	this._numNotes++;
+	this._cachedNotes = null;
 }
 
 
 Zotero.Item.prototype.decrementNoteCount = function() {
 	this._numNotes--;
+	this._cachedNotes = null;
+}
+
+
+Zotero.Item.prototype.clearCachedNotes = function () {
+	this._cachedNotes = null;
 }
 
 
@@ -2472,6 +2495,23 @@ Zotero.Item.prototype.getNotes = function(includeTrashed) {
 		return [];
 	}
 	
+	// Get the right cache array
+	if (!this._cachedNotes) {
+		this._cachedNotes = {
+			chronologicalWithTrashed: null,
+			chronologicalWithoutTrashed: null,
+			alphabeticalWithTrashed: null,
+			alphabeticalWithoutTrashed: null
+		};
+	}
+	var cache = this._cachedNotes;
+	var cacheKey = (Zotero.Prefs.get('sortNotesChronologically')
+			? 'chronological' : 'alphabetical')
+		+ 'With' + (includeTrashed ? '' : 'out') + 'Trashed';
+	if (cache[cacheKey] !== null) {
+		return cache[cacheKey];
+	}
+	
 	var sql = "SELECT N.itemID, title FROM itemNotes N NATURAL JOIN items "
 		+ "WHERE sourceItemID=?";
 	if (!includeTrashed) {
@@ -2481,11 +2521,14 @@ Zotero.Item.prototype.getNotes = function(includeTrashed) {
 	if (Zotero.Prefs.get('sortNotesChronologically')) {
 		sql += " ORDER BY dateAdded";
 		var results = Zotero.DB.columnQuery(sql, this.id);
-		return results ? results : [];
+		results = results ? results : [];
+		cache[cacheKey] = results;
+		return results;
 	}
 	
 	var notes = Zotero.DB.query(sql, this.id);
 	if (!notes) {
+		cache[cacheKey] = [];
 		return [];
 	}
 	
@@ -2502,6 +2545,7 @@ Zotero.Item.prototype.getNotes = function(includeTrashed) {
 	for each(var note in notes) {
 		noteIDs.push(note.itemID);
 	}
+	cache[cacheKey] = noteIDs;
 	return noteIDs;
 }
 
@@ -2516,11 +2560,18 @@ Zotero.Item.prototype.getNotes = function(includeTrashed) {
 ///////////////////////////////////////////////////////
 Zotero.Item.prototype.incrementAttachmentCount = function() {
 	this._numAttachments++;
+	this._cachedAttachments = null;
 }
 
 
 Zotero.Item.prototype.decrementAttachmentCount = function() {
 	this._numAttachments--;
+	this._cachedAttachments = null;
+}
+
+
+Zotero.Item.prototype.clearCachedAttachments = function () {
+	this._cachedAttachments = null;
 }
 
 
@@ -3276,7 +3327,24 @@ Zotero.Item.prototype.getAttachments = function(includeTrashed) {
 	if (!this.id) {
 		return [];
 	}
-	 
+	
+	// Get the right cache array
+	if (!this._cachedAttachments) {
+		this._cachedAttachments = {
+			chronologicalWithTrashed: null,
+			chronologicalWithoutTrashed: null,
+			alphabeticalWithTrashed: null,
+			alphabeticalWithoutTrashed: null
+		};
+	}
+	var cache = this._cachedAttachments;
+	var cacheKey = (Zotero.Prefs.get('sortAttachmentsChronologically')
+			? 'chronological' : 'alphabetical')
+		+ 'With' + (includeTrashed ? '' : 'out') + 'Trashed';
+	if (cache[cacheKey] !== null) {
+		return cache[cacheKey];
+	}
+	
 	var sql = "SELECT A.itemID, value AS title FROM itemAttachments A "
 		+ "NATURAL JOIN items I LEFT JOIN itemData ID "
 		+ "ON (fieldID=110 AND A.itemID=ID.itemID) "
@@ -3290,11 +3358,14 @@ Zotero.Item.prototype.getAttachments = function(includeTrashed) {
 	if (Zotero.Prefs.get('sortAttachmentsChronologically')) {
 		sql +=  " ORDER BY dateAdded";
 		var results = Zotero.DB.columnQuery(sql, this.id);
-		return results ? results : [];
+		results = results ? results : [];
+		cache[cacheKey] = results;
+		return results;
 	}
 	
 	var attachments = Zotero.DB.query(sql, this.id);
 	if (!attachments) {
+		cache[cacheKey] = [];
 		return [];
 	}
 	
@@ -3309,6 +3380,7 @@ Zotero.Item.prototype.getAttachments = function(includeTrashed) {
 	for each(var attachment in attachments) {
 		attachmentIDs.push(attachment.itemID);
 	}
+	cache[cacheKey] = attachmentIDs;
 	return attachmentIDs;
 }
 

From dfdfbf12583e3db191627bf77c2d0509959ba91a Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 3 Feb 2013 06:12:23 -0500
Subject: [PATCH 10/16] Properly clear temp DB tables from items list
 generation

---
 chrome/content/zotero/xpcom/collectionTreeView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js
index 252bce35a7..34189e83f8 100644
--- a/chrome/content/zotero/xpcom/collectionTreeView.js
+++ b/chrome/content/zotero/xpcom/collectionTreeView.js
@@ -1872,10 +1872,10 @@ Zotero.ItemGroupCache = {
 	"clear":function() {
 		this.lastItemGroup = null;
 		this.lastSearch = null;
-		this.lastTempTable = null;
 		if(this.lastTempTable) {
 			Zotero.DB.query("DROP TABLE "+this.lastTempTable);
 		}
+		this.lastTempTable = null;
 		this.lastResults = null;
 	}
 };

From 2cd45be19162d920fc6f9d96f876b504ab19bc23 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 3 Feb 2013 19:19:25 -0500
Subject: [PATCH 11/16] Avoid unnecessary UI updates in various situations

beginUpdateBatch() doesn't suppress select events, so various batch
operations were triggering lots of extra selects.

This hopefully fixes the long hang some people were seeing when making
changes with an open quick search (which I was only able to reproduce in
Standalone).
---
 chrome/content/zotero/xpcom/itemTreeView.js | 88 +++++++++++++++++----
 1 file changed, 74 insertions(+), 14 deletions(-)

diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
index ffab65cda0..99974361e0 100644
--- a/chrome/content/zotero/xpcom/itemTreeView.js
+++ b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -231,6 +231,14 @@ Zotero.ItemTreeView.prototype._refreshGenerator = function()
 	
 	this._searchMode = this._itemGroup.isSearchMode();
 	
+	if (!this.selection.selectEventsSuppressed) {
+		var unsuppress = this.selection.selectEventsSuppressed = true;
+		this._treebox.beginUpdateBatch();
+	}
+	var savedSelection = this.saveSelection();
+	var savedOpenState = this.saveOpenState();
+	var savedFirstRow = this.saveFirstRow();
+	
 	var oldRows = this.rowCount;
 	this._dataItems = [];
 	this._searchItemIDs = {}; // items matching the search
@@ -311,6 +319,15 @@ Zotero.ItemTreeView.prototype._refreshGenerator = function()
 		Zotero.UnresponsiveScriptIndicator.enable();
 	}
 	
+	this.rememberOpenState(savedOpenState);
+	this.rememberFirstRow(savedFirstRow);
+	this.rememberSelection(savedSelection);
+	this.expandMatchParents();
+	if (unsuppress) {
+		this._treebox.endUpdateBatch();
+		this.selection.selectEventsSuppressed = false;
+	}
+	
 	yield false;
 }
 
@@ -399,6 +416,7 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids, extraData)
 	}
 	
 	this.selection.selectEventsSuppressed = true;
+	this._treebox.beginUpdateBatch();
 	
 	if ((action == 'remove' && !itemGroup.isLibrary(true))
 			|| action == 'delete' || action == 'trash') {
@@ -729,6 +747,7 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids, extraData)
 		this.rememberSelection(savedSelection);
 	}
 	
+	this._treebox.endUpdateBatch();
 	this.selection.selectEventsSuppressed = false;
 }
 
@@ -1380,6 +1399,11 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 	}
 	
 	// Need to close all containers before sorting
+	if (!this.selection.selectEventsSuppressed) {
+		var unsuppress = this.selection.selectEventsSuppressed = true;
+		this._treebox.beginUpdateBatch();
+	}
+	var savedSelection = this.saveSelection();
 	var openItemIDs = this.saveOpenState(true);
 	
 	// Single-row sort
@@ -1423,6 +1447,12 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 	this._refreshHashMap();
 	
 	this.rememberOpenState(openItemIDs);
+	this.rememberSelection(savedSelection);
+	
+	if (unsuppress) {
+		this.selection.selectEventsSuppressed = false;
+		this._treebox.endUpdateBatch();
+	}
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1638,7 +1668,7 @@ Zotero.ItemTreeView.prototype.deleteSelection = function (force)
 
 
 /*
- * Set the tags filter on the view
+ * Set the search/tags filter on the view
  */
 Zotero.ItemTreeView.prototype.setFilter = function(type, data) {
 	if (!this._treebox || !this._treebox.treeBody) {
@@ -1647,9 +1677,7 @@ Zotero.ItemTreeView.prototype.setFilter = function(type, data) {
 	}
 	
 	this.selection.selectEventsSuppressed = true;
-	var savedSelection = this.saveSelection();
-	var savedOpenState = this.saveOpenState();
-	var savedFirstRow = this.saveFirstRow();
+	this._treebox.beginUpdateBatch();
 	
 	switch (type) {
 		case 'search':
@@ -1666,11 +1694,7 @@ Zotero.ItemTreeView.prototype.setFilter = function(type, data) {
 	
 	this.sort();
 	
-	this.rememberOpenState(savedOpenState);
-	this.expandMatchParents();
-	this.rememberFirstRow(savedFirstRow);
-	this.rememberSelection(savedSelection);
-	this._treebox.invalidate();
+	this._treebox.endUpdateBatch();
 	this.selection.selectEventsSuppressed = false;
 	
 	//Zotero.debug('Running callbacks in itemTreeView.setFilter()', 4);
@@ -1751,6 +1775,10 @@ Zotero.ItemTreeView.prototype.rememberSelection = function(selection)
 {	
 	this.selection.clearSelection();
 	
+	if (!this.selection.selectEventsSuppressed) {
+		var unsuppress = this.selection.selectEventsSuppressed = true;
+		this._treebox.beginUpdateBatch();
+	}
 	for(var i=0; i < selection.length; i++)
 	{
 		if (this._itemRowMap[selection[i]] != null) {
@@ -1777,6 +1805,10 @@ Zotero.ItemTreeView.prototype.rememberSelection = function(selection)
 			}
 		}
 	}
+	if (unsuppress) {
+		this._treebox.endUpdateBatch();
+		this.selection.selectEventsSuppressed = false;
+	}
 }
 
 
@@ -1796,6 +1828,12 @@ Zotero.ItemTreeView.prototype.selectSearchMatches = function () {
 
 Zotero.ItemTreeView.prototype.saveOpenState = function(close) {
 	var itemIDs = [];
+	if (close) {
+		if (!this.selection.selectEventsSuppressed) {
+			var unsuppress = this.selection.selectEventsSuppressed = true;
+			this._treebox.beginUpdateBatch();
+		}
+	}
 	for (var i=0; i<this._dataItems.length; i++) {
 		if (this.isContainer(i) && this.isContainerOpen(i)) {
 			itemIDs.push(this._getItemAtRow(i).ref.id);
@@ -1806,6 +1844,10 @@ Zotero.ItemTreeView.prototype.saveOpenState = function(close) {
 	}
 	if (close) {
 		this._refreshHashMap();
+		if (unsuppress) {
+			this._treebox.endUpdateBatch();
+			this.selection.selectEventsSuppressed = false;
+		}
 	}
 	return itemIDs;
 }
@@ -1825,13 +1867,19 @@ Zotero.ItemTreeView.prototype.rememberOpenState = function(itemIDs) {
 		return a - b;
 	});
 	
-	this._treebox.beginUpdateBatch();
+	if (!this.selection.selectEventsSuppressed) {
+		var unsuppress = this.selection.selectEventsSuppressed = true;
+		this._treebox.beginUpdateBatch();
+	}
 	// Reopen from bottom up
 	for (var i=rowsToOpen.length-1; i>=0; i--) {
 		this.toggleOpenState(rowsToOpen[i], true);
 	}
-	this._treebox.endUpdateBatch();
 	this._refreshHashMap();
+	if (unsuppress) {
+		this._treebox.endUpdateBatch();
+		this.selection.selectEventsSuppressed = false;
+	}
 }
 
 
@@ -1846,7 +1894,10 @@ Zotero.ItemTreeView.prototype.expandMatchParents = function () {
 		hash[id] = true;
 	}
 	
-	this._treebox.beginUpdateBatch();
+	if (!this.selection.selectEventsSuppressed) {
+		var unsuppress = this.selection.selectEventsSuppressed = true;
+		this._treebox.beginUpdateBatch();
+	}
 	for (var i=0; i<this.rowCount; i++) {
 		var id = this._getItemAtRow(i).ref.id;
 		if (hash[id] && this.isContainer(i) && !this.isContainerOpen(i)) {
@@ -1854,7 +1905,10 @@ Zotero.ItemTreeView.prototype.expandMatchParents = function () {
 		}
 	}
 	this._refreshHashMap();
-	this._treebox.endUpdateBatch();
+	if (unsuppress) {
+		this._treebox.endUpdateBatch();
+		this.selection.selectEventsSuppressed = false;
+	}
 }
 
 
@@ -1875,7 +1929,7 @@ Zotero.ItemTreeView.prototype.rememberFirstRow = function(firstRow) {
 
 
 Zotero.ItemTreeView.prototype.expandAllRows = function() {
-	this.selection.selectEventsSuppressed = true;
+	var unsuppress = this.selection.selectEventsSuppressed = true;
 	this._treebox.beginUpdateBatch();
 	for (var i=0; i<this.rowCount; i++) {
 		if (this.isContainer(i) && !this.isContainerOpen(i)) {
@@ -1889,6 +1943,7 @@ Zotero.ItemTreeView.prototype.expandAllRows = function() {
 
 
 Zotero.ItemTreeView.prototype.collapseAllRows = function() {
+	var unsuppress = this.selection.selectEventsSuppressed = true;
 	this._treebox.beginUpdateBatch();
 	for (var i=0; i<this.rowCount; i++) {
 		if (this.isContainer(i) && this.isContainerOpen(i)) {
@@ -1897,11 +1952,13 @@ Zotero.ItemTreeView.prototype.collapseAllRows = function() {
 	}
 	this._refreshHashMap();
 	this._treebox.endUpdateBatch();
+	this.selection.selectEventsSuppressed = false;
 }
 
 
 Zotero.ItemTreeView.prototype.expandSelectedRows = function() {
 	var start = {}, end = {};
+	this.selection.selectEventsSuppressed = true;
 	this._treebox.beginUpdateBatch();
 	for (var i = 0, len = this.selection.getRangeCount(); i<len; i++) {
 		this.selection.getRangeAt(i, start, end);
@@ -1913,11 +1970,13 @@ Zotero.ItemTreeView.prototype.expandSelectedRows = function() {
 	}
 	this._refreshHashMap();
 	this._treebox.endUpdateBatch();
+	this.selection.selectEventsSuppressed = false;
 }
 
 
 Zotero.ItemTreeView.prototype.collapseSelectedRows = function() {
 	var start = {}, end = {};
+	this.selection.selectEventsSuppressed = true;
 	this._treebox.beginUpdateBatch();
 	for (var i = 0, len = this.selection.getRangeCount(); i<len; i++) {
 		this.selection.getRangeAt(i, start, end);
@@ -1929,6 +1988,7 @@ Zotero.ItemTreeView.prototype.collapseSelectedRows = function() {
 	}
 	this._refreshHashMap();
 	this._treebox.endUpdateBatch();
+	this.selection.selectEventsSuppressed = false;
 }
 
 

From 650c3935076165a2bd4626daba1012fc0fac9156 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 4 Feb 2013 01:56:29 -0500
Subject: [PATCH 12/16] Expose launchNonNativeFiles hidden pref in Firefox

"Open PDFs and other files within Firefox when possible"
---
 chrome/content/zotero/preferences/preferences.js          | 8 ++++++++
 chrome/content/zotero/preferences/preferences.xul         | 5 ++---
 chrome/content/zotero/preferences/preferences_firefox.xul | 8 ++++++++
 chrome/locale/en-US/zotero/zotero.properties              | 1 +
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences.js b/chrome/content/zotero/preferences/preferences.js
index 13b7fcaf8e..38386a7bb1 100644
--- a/chrome/content/zotero/preferences/preferences.js
+++ b/chrome/content/zotero/preferences/preferences.js
@@ -90,6 +90,14 @@ function init()
 		rows[i].firstChild.nextSibling.value = Zotero.isMac ? 'Cmd+Shift+' : 'Ctrl+Alt+';
 	}
 	
+	// JS-based strings
+	var checkbox = document.getElementById('launchNonNativeFiles-checkbox');
+	if (checkbox ) {
+		checkbox.label = Zotero.getString(
+			'zotero.preferences.launchNonNativeFiles', Zotero.appName
+		);
+	}
+	
 	updateStorageSettings(null, null, true);
 	updateWordProcessorInstructions();
 	refreshStylesList();
diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
index 575862bddc..c3f0d5f612 100644
--- a/chrome/content/zotero/preferences/preferences.xul
+++ b/chrome/content/zotero/preferences/preferences.xul
@@ -117,7 +117,7 @@ To add a new preference:
 			<label class="statusLine" value="&zotero.preferences.keys.changesTakeEffect;"/>
 		</groupbox>
 		
-		<groupbox>
+		<groupbox id="zotero-prefpane-miscellaneous-groupbox">
 			<caption label="&zotero.preferences.miscellaneous;"/>
 			
 			<hbox align="center">
@@ -129,11 +129,10 @@ To add a new preference:
 			<checkbox label="&zotero.preferences.zoteroDotOrgVersionHeader;"
 				tooltiptext="&zotero.preferences.zoteroDotOrgVersionHeader.tooltip;"
 				preference="pref-zoteroDotOrgVersionHeader"/>
-			<checkbox label="&zotero.preferences.parseRISRefer;" preference="pref-parseEndNoteMIMETypes"/>
+			<checkbox id="parse-ris-checkbox" label="&zotero.preferences.parseRISRefer;" preference="pref-parseEndNoteMIMETypes"/>
 			<checkbox label="&zotero.preferences.automaticSnapshots;" preference="pref-automaticSnapshots"/>
 			<checkbox label="&zotero.preferences.downloadAssociatedFiles;" preference="pref-downloadAssociatedFiles"/>
 			<checkbox label="&zotero.preferences.automaticTags;" preference="pref-automaticTags"/>
-			
 			<hbox align="center">
 				<label value="&zotero.preferences.trashAutoEmptyDaysPre;"/>
 				<textbox size="2" preference="pref-trashAutoEmptyDays"/>
diff --git a/chrome/content/zotero/preferences/preferences_firefox.xul b/chrome/content/zotero/preferences/preferences_firefox.xul
index 1a851e267e..7c4894f6a4 100644
--- a/chrome/content/zotero/preferences/preferences_firefox.xul
+++ b/chrome/content/zotero/preferences/preferences_firefox.xul
@@ -48,6 +48,7 @@ To add a new preference:
 			<preferences id="zotero-prefpane-general-preferences">
 				<preference id="pref-showIn" name="extensions.zotero.showIn" type="int"/>
 				<preference id="pref-statusBarIcon" name="extensions.zotero.statusBarIcon" type="int"/>
+				<preference id="pref-launchNonNativeFiles" name="extensions.zotero.launchNonNativeFiles" type="bool"/>
 			</preferences>
 			<groupbox id="zotero-prefpane-general-groupbox">
 				<grid id="zotero-prefpane-general-grid">
@@ -75,6 +76,13 @@ To add a new preference:
 					</rows>
 				</grid>
 			</groupbox>
+			<groupbox id="zotero-prefpane-miscellaneous-groupbox">
+				<checkbox id="launchNonNativeFiles-checkbox"
+					insertbefore="parse-ris-checkbox"
+					preference="pref-launchNonNativeFiles"
+					onsyncfrompreference="return !document.getElementById(this.getAttribute('preference')).value"
+					onsynctopreference="return !this.checked"/>
+			</groupbox>
 		</prefpane>
 		
 		<prefpane id="zotero-prefpane-export"
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 1a561b48b8..01dd48c1af 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -447,6 +447,7 @@ db.integrityCheck.reportInForums = You can report this problem in the Zotero For
 zotero.preferences.update.updated = Updated
 zotero.preferences.update.upToDate = Up to date
 zotero.preferences.update.error = Error
+zotero.preferences.launchNonNativeFiles                   = Open PDFs and other files within %S when possible
 zotero.preferences.openurl.resolversFound.zero			= %S resolvers found
 zotero.preferences.openurl.resolversFound.singular		= %S resolver found
 zotero.preferences.openurl.resolversFound.plural			= %S resolvers found

From 1b1df60725e9b00e3cd0351b4285764c7993c3de Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 4 Feb 2013 02:05:04 -0500
Subject: [PATCH 13/16] Make X-Zotero-Version and RIS/Refer prefs Firefox-only

---
 .../content/zotero/preferences/preferences.xul  | 10 +++-------
 .../zotero/preferences/preferences_firefox.xul  | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
index c3f0d5f612..b96bb64a21 100644
--- a/chrome/content/zotero/preferences/preferences.xul
+++ b/chrome/content/zotero/preferences/preferences.xul
@@ -54,8 +54,6 @@ To add a new preference:
 			<preference id="pref-noteFontSize" name="extensions.zotero.note.fontSize" type="string"/>
 			<preference id="pref-automaticScraperUpdates" name="extensions.zotero.automaticScraperUpdates" type="bool"/>
 			<preference id="pref-reportTranslationFailure" name="extensions.zotero.reportTranslationFailure" type="bool"/>
-			<preference id="pref-zoteroDotOrgVersionHeader" name="extensions.zotero.zoteroDotOrgVersionHeader" type="bool"/>
-			<preference id="pref-parseEndNoteMIMETypes" name="extensions.zotero.parseEndNoteMIMETypes" type="bool" onchange="Zotero.MIMETypeHandler.init()"/>
 			<preference id="pref-automaticSnapshots" name="extensions.zotero.automaticSnapshots" type="bool"/>
 			<preference id="pref-downloadAssociatedFiles" name="extensions.zotero.downloadAssociatedFiles" type="bool"/>
 			<preference id="pref-automaticTags" name="extensions.zotero.automaticTags" type="bool"/>
@@ -126,11 +124,9 @@ To add a new preference:
 			</hbox>
 			
 			<checkbox label="&zotero.preferences.reportTranslationFailure;" preference="pref-reportTranslationFailure"/>
-			<checkbox label="&zotero.preferences.zoteroDotOrgVersionHeader;"
-				tooltiptext="&zotero.preferences.zoteroDotOrgVersionHeader.tooltip;"
-				preference="pref-zoteroDotOrgVersionHeader"/>
-			<checkbox id="parse-ris-checkbox" label="&zotero.preferences.parseRISRefer;" preference="pref-parseEndNoteMIMETypes"/>
-			<checkbox label="&zotero.preferences.automaticSnapshots;" preference="pref-automaticSnapshots"/>
+			<checkbox id="automaticSnapshots-checkbox"
+				label="&zotero.preferences.automaticSnapshots;"
+				preference="pref-automaticSnapshots"/>
 			<checkbox label="&zotero.preferences.downloadAssociatedFiles;" preference="pref-downloadAssociatedFiles"/>
 			<checkbox label="&zotero.preferences.automaticTags;" preference="pref-automaticTags"/>
 			<hbox align="center">
diff --git a/chrome/content/zotero/preferences/preferences_firefox.xul b/chrome/content/zotero/preferences/preferences_firefox.xul
index 7c4894f6a4..0cce975613 100644
--- a/chrome/content/zotero/preferences/preferences_firefox.xul
+++ b/chrome/content/zotero/preferences/preferences_firefox.xul
@@ -49,6 +49,12 @@ To add a new preference:
 				<preference id="pref-showIn" name="extensions.zotero.showIn" type="int"/>
 				<preference id="pref-statusBarIcon" name="extensions.zotero.statusBarIcon" type="int"/>
 				<preference id="pref-launchNonNativeFiles" name="extensions.zotero.launchNonNativeFiles" type="bool"/>
+				<preference id="pref-zoteroDotOrgVersionHeader"
+					name="extensions.zotero.zoteroDotOrgVersionHeader"
+					type="bool"/>
+				<preference id="pref-parseEndNoteMIMETypes"
+					name="extensions.zotero.parseEndNoteMIMETypes"
+					type="bool" onchange="Zotero.MIMETypeHandler.init()"/>
 			</preferences>
 			<groupbox id="zotero-prefpane-general-groupbox">
 				<grid id="zotero-prefpane-general-grid">
@@ -77,11 +83,18 @@ To add a new preference:
 				</grid>
 			</groupbox>
 			<groupbox id="zotero-prefpane-miscellaneous-groupbox">
+				<checkbox label="&zotero.preferences.zoteroDotOrgVersionHeader;"
+					tooltiptext="&zotero.preferences.zoteroDotOrgVersionHeader.tooltip;"
+					preference="pref-zoteroDotOrgVersionHeader"
+					insertbefore="automaticSnapshots-checkbox"/>
 				<checkbox id="launchNonNativeFiles-checkbox"
-					insertbefore="parse-ris-checkbox"
 					preference="pref-launchNonNativeFiles"
 					onsyncfrompreference="return !document.getElementById(this.getAttribute('preference')).value"
-					onsynctopreference="return !this.checked"/>
+					onsynctopreference="return !this.checked"
+					insertbefore="automaticSnapshots-checkbox"/>
+				<checkbox label="&zotero.preferences.parseRISRefer;"
+					preference="pref-parseEndNoteMIMETypes"
+					insertbefore="automaticSnapshots-checkbox"/>
 			</groupbox>
 		</prefpane>
 		

From 194343cb0f8dc21f262b901797f628df2b042cb6 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 4 Feb 2013 03:40:57 -0500
Subject: [PATCH 14/16] Don't update item when leaving an empty field

It looks like this has been happening for at least all of 3.0, including
when tabbing between empty fields.
---
 chrome/content/zotero/xpcom/data/item.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js
index 42d8341918..e8cfa65796 100644
--- a/chrome/content/zotero/xpcom/data/item.js
+++ b/chrome/content/zotero/xpcom/data/item.js
@@ -770,7 +770,11 @@ Zotero.Item.prototype.setField = function(field, value, loadIn) {
 		return true;
 	}
 	
-	if (!Zotero.ItemFields.isValidForType(fieldID, this.itemTypeID)) {
+	if (value === "") {
+		value = false;
+	}
+	
+	if (value !== false && !Zotero.ItemFields.isValidForType(fieldID, this.itemTypeID)) {
 		var msg = "'" + field + "' is not a valid field for type " + this.itemTypeID;
 		
 		if (loadIn) {
@@ -806,7 +810,9 @@ Zotero.Item.prototype.setField = function(field, value, loadIn) {
 		}
 		
 		// If existing value, make sure it's actually changing
-		if ((this._itemData[fieldID] + "") === (value + "")) {
+		if ((typeof this._itemData[fieldID] == 'undefined' && value === false)
+				|| (typeof this._itemData[fieldID] != 'undefined'
+					&& this._itemData[fieldID] === value)) {
 			return false;
 		}
 		

From e2ea7532ba0a37b52520b805a9cc6a8b92a235af Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 4 Feb 2013 04:08:34 -0500
Subject: [PATCH 15/16] Fixes #47, Dragging attachment to item removes search
 results

---
 chrome/content/zotero/xpcom/itemTreeView.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
index 99974361e0..7144dc91b5 100644
--- a/chrome/content/zotero/xpcom/itemTreeView.js
+++ b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -599,9 +599,20 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids, extraData)
 		// Otherwise re-run the search, which refreshes the item list
 		else
 		{
-			// For item adds, clear quicksearch
+			// For item adds, clear the quicksearch, unless all the new items
+			// are child items
 			if (activeWindow && type == 'item') {
-				quicksearch.value = '';
+				var clear = false;
+				var items = Zotero.Items.get(ids);
+				for each(var item in items) {
+					if (!item.getSource()) {
+						clear = true;
+						break;
+					}
+				}
+				if (clear) {
+					quicksearch.value = '';
+				}
 			}
 			quicksearch.doCommand();
 			madeChanges = true;

From 46e3e7293e9e38ed57333081b34e78bf1a5056c2 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 4 Feb 2013 05:03:12 -0500
Subject: [PATCH 16/16] Fix "results.sort is not a function" in tags
 autocomplete

This occured if there were no autocomplete results for an entered tag
string.
---
 components/zotero-autocomplete.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/zotero-autocomplete.js b/components/zotero-autocomplete.js
index 4639b7ef41..f1b11eabaf 100644
--- a/components/zotero-autocomplete.js
+++ b/components/zotero-autocomplete.js
@@ -88,6 +88,9 @@ ZoteroAutoComplete.prototype.startSearch = function(searchString, searchParam, p
 			statement = this._zotero.DB.getStatement(sql, sqlParams);
 			
 			var resultsCallback = function (results) {
+				if (!results) {
+					return;
+				}
 				var collation = self._zotero.getLocaleCollation();
 				results.sort(function(a, b) {
 					return collation.compareString(1, a.val, b.val);