Merge branch '3.0'
Conflicts: chrome/content/zotero/preferences/preferences.xul chrome/content/zotero/xpcom/data/item.js chrome/content/zotero/xpcom/utilities_translate.js
This commit is contained in:
commit
0061ff3ca5
56 changed files with 401 additions and 125 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue