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

Test improved lock

pull/1/head
yflory 2021-02-22 13:27:30 +01:00
parent 5defa729e7
commit 2172e1405c
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -989,6 +989,7 @@ define([
deleteOfflineLocks();
// Prepare callback
if (cpNfInner) {
APP.waitLock = Util.mkEvent(true);
var onPatchSent = function (again) {
if (!again) { cpNfInner.offPatchSent(onPatchSent); }
// Answer to our onlyoffice
@ -1004,6 +1005,8 @@ define([
type: "getLock",
locks: getLock()
});
APP.waitLock.fire();
delete APP.waitLock;
} else {
if (!isLockedModal.modal) {
isLockedModal.modal = UI.openCustomModal(isLockedModal.content);
@ -1127,10 +1130,19 @@ define([
case "isSaveLock":
// TODO ping the server to check if we're online first?
if (!offline) {
send({
type: "saveLock",
saveLock: false
}, true);
if (APP.waitLock) {
APP.waitLock.reg(function () {
send({
type: "saveLock",
saveLock: false
}, true);
});
} else {
send({
type: "saveLock",
saveLock: false
}, true);
}
}
break;
case "getLock":