mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Make Zotero.Schema more shimmable in Electron

Browse source
This commit is contained in:
Adomas Venčkauskas 2018-08-23 15:59:43 +03:00
parent 3d493014ca
commit 28fa8dd03c
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
chrome/content/zotero/xpcom/schema.js
View file

@ -48,7 +48,7 @@ Zotero.Schema = new function(){
var _repositoryNotificationTimerID; var _repositoryNotificationTimerID;
var _nextRepositoryUpdate; var _nextRepositoryUpdate;
var _remoteUpdateInProgress = false; var _remoteUpdateInProgress = false;
var _localUpdateInProgress = false; this._localUpdateInProgress = false;
var self = this; var self = this;
@ -459,12 +459,12 @@ Zotero.Schema = new function(){
return; return;
} }
if (_localUpdateInProgress) { if (this._localUpdateInProgress) {
Zotero.debug("Bundled file update already in progress", 2); Zotero.debug("Bundled file update already in progress", 2);
return; return;
} }
_localUpdateInProgress = true; this._localUpdateInProgress = true;
try { try {
yield Zotero.proxyAuthComplete.delay(1000); yield Zotero.proxyAuthComplete.delay(1000);
@ -512,24 +512,24 @@ Zotero.Schema = new function(){
switch (mode) { switch (mode) {
case 'styles': case 'styles':
yield Zotero.Styles.init(initOpts); yield Zotero.Styles.init(initOpts);
var updated = yield _updateBundledFilesAtLocation(installLocation, mode); var updated = yield this._updateBundledFilesAtLocation(installLocation, mode);
break; break;
case 'translators': case 'translators':
yield Zotero.Translators.init(initOpts); yield Zotero.Translators.init(initOpts);
var updated = yield _updateBundledFilesAtLocation(installLocation, mode); var updated = yield this._updateBundledFilesAtLocation(installLocation, mode);
break; break;
default: default:
yield Zotero.Translators.init(initOpts); yield Zotero.Translators.init(initOpts);
let up1 = yield _updateBundledFilesAtLocation(installLocation, 'translators', true); let up1 = yield this._updateBundledFilesAtLocation(installLocation, 'translators', true);
yield Zotero.Styles.init(initOpts); yield Zotero.Styles.init(initOpts);
let up2 = yield _updateBundledFilesAtLocation(installLocation, 'styles'); let up2 = yield this._updateBundledFilesAtLocation(installLocation, 'styles');
var updated = up1 || up2; var updated = up1 || up2;
} }
} }
finally { finally {
_localUpdateInProgress = false; this._localUpdateInProgress = false;
} }
return updated; return updated;
@ -542,7 +542,7 @@ Zotero.Schema = new function(){
* @param {'translators','styles'} mode * @param {'translators','styles'} mode
* @param {Boolean} [skipVersionUpdates=false] * @param {Boolean} [skipVersionUpdates=false]
*/ */
var _updateBundledFilesAtLocation = Zotero.Promise.coroutine(function* (installLocation, mode, skipVersionUpdates) { this._updateBundledFilesAtLocation = Zotero.Promise.coroutine(function* (installLocation, mode, skipVersionUpdates) {
Components.utils.import("resource://gre/modules/FileUtils.jsm"); Components.utils.import("resource://gre/modules/FileUtils.jsm");
var isUnpacked = (yield OS.File.stat(installLocation)).isDir; var isUnpacked = (yield OS.File.stat(installLocation)).isDir;
@ -1073,7 +1073,7 @@ Zotero.Schema = new function(){
} }
} }
if (_localUpdateInProgress) { if (this._localUpdateInProgress) {
Zotero.debug('A local update is already in progress -- delaying repository check', 4); Zotero.debug('A local update is already in progress -- delaying repository check', 4);
_setRepositoryTimer(600); _setRepositoryTimer(600);
return false; return false;