web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix race condition onlyoffice

Browse Source
This commit is contained in:
yflory 2020-01-21 18:50:45 +01:00
parent 03ad3218de
commit 47e3cffde7
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -535,16 +535,6 @@ define([
type: "documentOpen", type: "documentOpen",
data: {"type":"open","status":"ok","data":{"Editor.bin":obj.openCmd.url}} data: {"type":"open","status":"ok","data":{"Editor.bin":obj.openCmd.url}}
}); });
if (APP.migrate && !readOnly) {
var div = h('div.cp-oo-x2tXls', [
h('span.fa.fa-spin.fa-spinner'),
h('span', Messages.oo_sheetMigration_loading)
]);
UI.openCustomModal(UI.dialog.customModal(div, {buttons: []}));
setTimeout(function () {
makeCheckpoint(true);
}, 1000);
}
// Update current index // Update current index
var last = ooChannel.queue.pop(); var last = ooChannel.queue.pop();
if (last) { ooChannel.lastHash = last.hash; } if (last) { ooChannel.lastHash = last.hash; }
@ -786,6 +776,18 @@ define([
}); });
} }
}, },
"onDocumentReady": function () {
if (APP.migrate && !readOnly) {
var div = h('div.cp-oo-x2tXls', [
h('span.fa.fa-spin.fa-spinner'),
h('span', Messages.oo_sheetMigration_loading)
]);
UI.openCustomModal(UI.dialog.customModal(div, {buttons: []}));
setTimeout(function () {
makeCheckpoint(true);
}, 1000);
}
}
} }
}; };
window.onbeforeunload = function () { window.onbeforeunload = function () {