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

Better lock message

pull/1/head
yflory 2020-03-18 14:47:33 +01:00
parent 7bb59b518f
commit e1119290df
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/common/common-interface.js
View File

@ -458,6 +458,7 @@ define([
setTimeout(function () {
Notifier.notify();
});
return frame;
};
UI.alert = function (msg, cb, opt) {

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

@ -531,6 +531,9 @@ define([
delete content.locks[id];
}
});
if (content.saveLock && !isUserOnline(content.saveLock)) {
delete content.saveLock;
}
};
var handleAuth = function (obj, send) {
@ -595,9 +598,16 @@ define([
};
// Add a lock
var isLockedModal = {
content: UI.customModal(h('div', [
h('span.fa.fa-spin.fa-spinner'),
"pewpewpew"
]))
var handleLock = function (obj, send) {
if (content.saveLock) {
if (Messages.oo_isLocked) { UI.log(Messages.oo_isLocked); }
if (!isLockedModal.modal) {
isLockedModal.modal = UI.openCustomModal(isLockedModal.content);
}
setTimeout(function () {
handleLock(obj, send);
}, 50);
@ -621,12 +631,18 @@ define([
if (!again) { cpNfInner.offPatchSent(onPatchSent); }
// Answer to our onlyoffice
if (!content.saveLock) {
if (isLockedModal.modal) {
isLockedModal.modal.closeModal();
delete isLockedModal.modal();
}
send({
type: "getLock",
locks: getLock()
});
} else {
if (Messages.oo_isLocked) { UI.log(Messages.oo_isLocked); }
if (!isLockedModal.modal) {
isLockedModal.modal = UI.openCustomModal(isLockedModal.content);
}
setTimeout(function () {
onPatchSent(true);
}, 50);