suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Miscellaneous tweaks

Browse Source
This commit is contained in:
Dan Stillman 2016-04-23 00:59:20 -04:00
parent b66a6b9518
commit f633db1f01
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chrome/content/zotero/xpcom/db.js
View File

@ -531,7 +531,7 @@ Zotero.DBConnection.prototype.executeTransaction = Zotero.Promise.coroutine(func
} }
else { else {
Zotero.debug(`Rolled back DB transaction ${id}`, 1); Zotero.debug(`Rolled back DB transaction ${id}`, 1);
Zotero.debug(e, 1); Zotero.debug(e.message, 1);
} }
if (startedTransaction) { if (startedTransaction) {
this._transactionID = null; this._transactionID = null;

3
chrome/content/zotero/xpcom/itemTreeView.js
View File

@ -1382,7 +1382,8 @@ Zotero.ItemTreeView.prototype.sort = function (itemID) {
var collation = Zotero.getLocaleCollation(); var collation = Zotero.getLocaleCollation();
var sortCreatorAsString = Zotero.Prefs.get('sortCreatorAsString'); var sortCreatorAsString = Zotero.Prefs.get('sortCreatorAsString');
Zotero.debug("Sorting items list by " + sortFields.join(", ") + " " + dir); Zotero.debug("Sorting items list by " + sortFields.join(", ") + " " + dir
+ (itemID ? " for 1 item" : ""));
// Set whether rows with empty values should be displayed last, // Set whether rows with empty values should be displayed last,
// which may be different for primary and secondary sorting. // which may be different for primary and secondary sorting.

2
chrome/content/zotero/xpcom/sync/syncLocal.js
View File

@ -419,7 +419,7 @@ Zotero.Sync.Data.Local = {
json = json.map(o => this._checkCacheJSON(o)); json = json.map(o => this._checkCacheJSON(o));
if (options.setStatus) { if (options.setStatus) {
options.setStatus("Processing " + objectTypePlural); // TODO: localize options.setStatus("Downloading " + objectTypePlural + " in " + libraryName); // TODO: localize
} }
// Sort parent objects first, to avoid retries due to unmet dependencies // Sort parent objects first, to avoid retries due to unmet dependencies

1
test/tests/syncEngineTest.js
View File

@ -896,6 +896,7 @@ describe("Zotero.Sync.Data.Engine", function () {
yield assert.eventually.ok(Zotero.Searches.getByLibraryAndKeyAsync(userLibraryID, "DDDDDDDD")); yield assert.eventually.ok(Zotero.Searches.getByLibraryAndKeyAsync(userLibraryID, "DDDDDDDD"));
yield assert.eventually.ok(Zotero.Items.getByLibraryAndKeyAsync(userLibraryID, "GGGGGGGG")); yield assert.eventually.ok(Zotero.Items.getByLibraryAndKeyAsync(userLibraryID, "GGGGGGGG"));
// Check for queued objects
var keys = yield Zotero.Sync.Data.Local.getObjectsFromSyncQueue('collection', userLibraryID); var keys = yield Zotero.Sync.Data.Local.getObjectsFromSyncQueue('collection', userLibraryID);
assert.sameMembers(keys, ['BBBBBBBB']); assert.sameMembers(keys, ['BBBBBBBB']);