diff --git a/install-onlyoffice.sh b/install-onlyoffice.sh index ab38d1593..69d935150 100755 --- a/install-onlyoffice.sh +++ b/install-onlyoffice.sh @@ -98,7 +98,7 @@ main() { rm -rf "$OO_DIR/v8/web-apps/apps/spreadsheeteditor/main/resources/help" rm -rf "$OO_DIR/v8/web-apps/apps/common/main/resources/help/" ;; - v9) install_version v9 v9.3.0.140+2 fedf1af4c3b061f6afadbc231cee7f06d15dd1a5e82db3c5f1e9739b7ddf5b5b38825f3ec3da5e92d7ed6ad1d944c11b9f83875cc5fb67bde4f9c9b1434579d8 ;; + v9) install_version v9 v9.2.0.119+5 1f1184fb04cf72a7eb2a49a9740074b5419486c79e1fd713e1f8c09b8594a826050ae941fed6ac6a96807ba73cc751d7c807bd7e6b73de9e4f8e74cd5ed04cfa ;; x2t) install_x2t v7.3+1 ab0c05b0e4c81071acea83f0c6a8e75f5870c360ec4abc4af09105dd9b52264af9711ec0b7020e87095193ac9b6e20305e446f2321a541f743626a598e5318c1 ;; *) echo "Unknown version: $version" diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index a6fcb61f4..3711c587b 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -102,7 +102,7 @@ define([ hashes: {}, ids: {}, mediasSources: {}, - version: privateData.ooForceVersion ? Number(privateData.ooForceVersion) : OOCurrentVersion.currentVersionNumber, + version: privateData.ooForceVersion ? Number(privateData.ooForceVersion) : OOCurrentVersion.currentVersionNumber }; var oldHashes = {}; var oldIds = {}; @@ -2207,11 +2207,6 @@ define([ }]; common.checkTrimHistory(channels); } - - content.debug = content.debug ?? {}; - content.debug.idCollision = content.debug.idCollision ?? false; - APP.onLocal(); - console.log("OO ready"); }; @@ -2634,25 +2629,12 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null makeChannel(); return; } - - const onCorruptionWarning = Util.once((id) => { - console.log('id collision in document', id); - if (content?.debug?.idCollision !== undefined // No feedback for old documents - && content?.debug?.idCollision === false) { // Send feedback only once - Feedback.send(`channel=${content.channel}&OFFICE_DOCUMENT_ID_COLLISION`, true); - content.debug = content.debug ?? {}; - content.debug.idCollision = true; - APP.onLocal(); - } - }); - APP.docEditor.connectMockServer({ onMessage: fromOOHandler, getParticipants: getParticipants, onAuth: onAuth, getImageURL: getImageURL, getInitialChanges: getInitialChanges, - onCorruptionWarning: onCorruptionWarning, }); }; @@ -3017,7 +2999,7 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null pinImages(); }; - const loadCheckpoint = async function (cp, keepQueue) { + const loadCp = async function (cp, keepQueue) { if (!isLockedModal.modal) { isLockedModal.modal = UI.openCustomModal(isLockedModal.content); } @@ -3037,7 +3019,7 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null var loadHistoryCp = function (cp, keepQueue) { APP.history = true; APP.stopHistory = false; - loadCheckpoint(cp, keepQueue); + loadCp(cp, keepQueue); }; var loadTemplate = function (href, pw, parsed) { @@ -3087,7 +3069,7 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null }); ooChannel.historyLastHash = ooChannel.lastHash; ooChannel.currentIndex = ooChannel.cpIndex; - loadCheckpoint(lastCp, true); + loadCp(lastCp, true); }); }; @@ -3258,7 +3240,7 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null }; var onCheckpoint = function (cp) { // We want to load a checkpoint: - loadCheckpoint(cp, true); + loadCp(cp, true); }; var onPatchBack = function (cp, msgs) { APP.history = true; @@ -3278,10 +3260,10 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null }); ooChannel.queue = msgsFormatted; setTimeout(function () { - loadCheckpoint(cp, true); + loadCp(cp, true); }, 200); } else { - loadCheckpoint(cp); + loadCp(cp); } }; var docType = function() { @@ -3302,7 +3284,7 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null // Fill the queue and then load the last CP rtChannel.getHistory(function () { var lastCp = getLastCp(); - loadCheckpoint(lastCp, true); + loadCp(lastCp, true); }); }; @@ -3360,7 +3342,7 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null onPatch: onPatch, onPatchBack: onPatchBack, docType: docType, - loadCp: loadCheckpoint, + loadCp: loadCp, loadHistoryCp: loadHistoryCp, onCheckpoint: onCheckpoint, onRevert: commit,