infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix improved locks

pull/1/head
yflory 2021-02-23 13:57:15 +01:00
parent ae985cef20
commit 3496862ed9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/common/onlyoffice/inner.js
View File

@ -989,7 +989,12 @@ define([
deleteOfflineLocks();
// Prepare callback
if (cpNfInner) {
APP.waitLock = Util.mkEvent(true);
var waitLock = APP.waitLock = Util.mkEvent(true);
setTimeout(function () {
// Make sure the waitLock is never stuck
waitLock.fire();
if (waitLock === APP.waitLock) { delete APP.waitLock; }
}, 5000);
var onPatchSent = function (again) {
if (!again) { cpNfInner.offPatchSent(onPatchSent); }
// Answer to our onlyoffice
@ -1005,8 +1010,8 @@ define([
type: "getLock",
locks: getLock()
});
APP.waitLock.fire();
delete APP.waitLock;
waitLock.fire();
if (waitLock === APP.waitLock) { delete APP.waitLock; }
} else {
if (!isLockedModal.modal) {
isLockedModal.modal = UI.openCustomModal(isLockedModal.content);