From 66bfaaae13ba8590cb542b9ecafb4b232a5a201d Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 10 May 2012 18:55:17 -0400
Subject: [PATCH] Fix sorting of autocomplete tags dropdown (since Fx9 or so)

---
 components/zotero-autocomplete.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/components/zotero-autocomplete.js b/components/zotero-autocomplete.js
index e89f50977..4639b7ef4 100644
--- a/components/zotero-autocomplete.js
+++ b/components/zotero-autocomplete.js
@@ -90,7 +90,7 @@ ZoteroAutoComplete.prototype.startSearch = function(searchString, searchParam, p
 			var resultsCallback = function (results) {
 				var collation = self._zotero.getLocaleCollation();
 				results.sort(function(a, b) {
-					return collation.compareString(1, a, b);
+					return collation.compareString(1, a.val, b.val);
 				});
 			}
 			break;
@@ -208,6 +208,11 @@ ZoteroAutoComplete.prototype.startSearch = function(searchString, searchParam, p
 	// Disable asynchronous until we figure out the hangs
 	if (true) {
 		var rows = this._zotero.DB.query(sql, sqlParams);
+		
+		if (resultsCallback) {
+			resultsCallback(rows);
+		}
+		
 		var results = [];
 		var comments = [];
 		for each(var row in rows) {