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

Ability to force the version of onlyoffice

Browse Source
This commit is contained in:
yflory 2020-01-22 11:55:27 +01:00
parent 746b382166
commit ad8bf87c3f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ define([
hashes: {}, hashes: {},
ids: {}, ids: {},
mediasSources: {}, mediasSources: {},
version: NEW_VERSION version: privateData.ooForceVersion ? Number(privateData.ooForceVersion) : NEW_VERSION
}; };
var oldHashes = {}; var oldHashes = {};
var oldIds = {}; var oldIds = {};
@ -1437,7 +1437,11 @@ define([
var version = ''; var version = '';
// Old version detected: use the old OO and start the migration if we can // 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/'; version = 'v1/';
APP.migrate = true; APP.migrate = true;
// Registedred users can start the migration // Registedred users can start the migration

1
www/common/onlyoffice/main.js
View File

@ -38,6 +38,7 @@ define([
}).nThen(function (/*waitFor*/) { }).nThen(function (/*waitFor*/) {
var addData = function (obj) { var addData = function (obj) {
obj.ooType = window.location.pathname.replace(/^\//, '').replace(/\/$/, ''); obj.ooType = window.location.pathname.replace(/^\//, '').replace(/\/$/, '');
obj.ooForceVersion = localStorage.CryptPad_ooVersion || sessionStorage.CryptPad_ooVersion || "";
}; };
var addRpc = function (sframeChan, Cryptpad, Utils) { var addRpc = function (sframeChan, Cryptpad, Utils) {
sframeChan.on('Q_OO_SAVE', function (data, cb) { sframeChan.on('Q_OO_SAVE', function (data, cb) {