The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 11:05:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'soon' into staging

Browse Source
This commit is contained in:
yflory 2021-03-05 11:38:02 +01:00
commit bdbfbaa109
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -898,7 +898,7 @@ define([
var nId = id.slice(0,32);
if (users.indexOf(nId) === -1) {
// Offline locks: support old format
var l = typeof(locks[id]) === "object" ? getUserLock(id) : [locks[id]];
var l = (locks[id] && !locks[id].block) ? getUserLock(id) : [locks[id]];
ooChannel.send({
type: "releaseLock",
locks: l
@ -1371,6 +1371,7 @@ define([
} catch (e) {}
} else {
setEditable(true);
deleteOfflineLocks();
handleNewLocks({}, content.locks);
if (APP.unsavedChanges) {
var unsaved = APP.unsavedChanges;