From ad8bf87c3fbf1255679b8223e9ea5c63ff47f7e9 Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 22 Jan 2020 11:55:27 +0100 Subject: [PATCH] Ability to force the version of onlyoffice --- www/common/onlyoffice/inner.js | 8 ++++++-- www/common/onlyoffice/main.js | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index 438e49fe6..f2bc1f05d 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -81,7 +81,7 @@ define([ hashes: {}, ids: {}, mediasSources: {}, - version: NEW_VERSION + version: privateData.ooForceVersion ? Number(privateData.ooForceVersion) : NEW_VERSION }; var oldHashes = {}; var oldIds = {}; @@ -1437,7 +1437,11 @@ define([ var version = ''; // Old version detected: use the old OO and start the migration if we can - if (content && !content.version) { + if (privateData.ooForceVersion) { + if (privateData.ooForceVersion === "1") { + version = "v1/"; + } + } else if (content && (!content.version || content.version === 1)) { version = 'v1/'; APP.migrate = true; // Registedred users can start the migration diff --git a/www/common/onlyoffice/main.js b/www/common/onlyoffice/main.js index 5a79c94e3..b3a896360 100644 --- a/www/common/onlyoffice/main.js +++ b/www/common/onlyoffice/main.js @@ -38,6 +38,7 @@ define([ }).nThen(function (/*waitFor*/) { var addData = function (obj) { obj.ooType = window.location.pathname.replace(/^\//, '').replace(/\/$/, ''); + obj.ooForceVersion = localStorage.CryptPad_ooVersion || sessionStorage.CryptPad_ooVersion || ""; }; var addRpc = function (sframeChan, Cryptpad, Utils) { sframeChan.on('Q_OO_SAVE', function (data, cb) {