pengjunjie/document-server-integration
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/document-server-integration.git synced 2026-04-07 14:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

nodejs: new arguments in setHistoryData

Browse Source
This commit is contained in:
Sergey Linnik
2017-03-15 17:46:34 +03:00
parent 35c4dd6a95
commit 293919bb6e
2 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
web/documentserver-example/nodejs/app.js
View File

@ -437,8 +437,7 @@ app.get("/editor", function (req, res) {
var fileExt = req.query.fileExt;
var history = [];
var prevUrl = [];
var diff = [];
var historyData = [];
var lang = docManager.getLang();
var userid = req.query.userid ? req.query.userid : "uid-1";
var name = req.query.name ? req.query.name : "Jonn Smith";
@ -466,33 +465,49 @@ app.get("/editor", function (req, res) {
var countVersion = 1;
var historyPath = docManager.historyPath(fileName, userAddress);
changes = null;
var changes = null;
var keyVersion = key;
if (historyPath != '') {
countVersion = docManager.countVersion(historyPath) + 1;
var prevPath = docManager.getlocalFileUri(fileName, 1) + "/prev" + fileUtility.getFileExtension(fileName);
var diffPath = null;
for (var i = 1; i < countVersion; i++) {
var keyPath = docManager.keyPath(fileName, userAddress, i);
var keyVersion = "" + fileSystem.readFileSync(keyPath);
for (var i = 1; i <= countVersion; i++) {
if (i < countVersion) {
var keyPath = docManager.keyPath(fileName, userAddress, i);
keyVersion = "" + fileSystem.readFileSync(keyPath);
} else {
keyVersion = key;
}
history.push(docManager.getHistory(fileName, changes, keyVersion, i));
prevUrl.push(prevPath);
prevPath = docManager.getlocalFileUri(fileName, i) + "/prev" + fileUtility.getFileExtension(fileName);
diff.push(diffPath);
diffPath = docManager.getlocalFileUri(fileName, i) + "/diff.zip";
var changesFile = docManager.changesPath(fileName, userAddress, i);
var changes = docManager.getChanges(changesFile);
var historyD = {
version: i,
key: keyVersion,
url: i == countVersion ? url : (docManager.getlocalFileUri(fileName, i) + "/prev" + fileUtility.getFileExtension(fileName)),
};
if (i > 1) {
historyD.previous = {
key: historyData[i-2].key,
url: historyData[i-2].url,
};
historyD.changesUrl = docManager.getlocalFileUri(fileName, i-1) + "/diff.zip";
}
historyData.push(historyD);
if (i < countVersion) {
var changesFile = docManager.changesPath(fileName, userAddress, i);
changes = docManager.getChanges(changesFile);
}
}
prevUrl.push(prevPath);
diff.push(diffPath);
} else {
prevUrl.push(url);
history.push(docManager.getHistory(fileName, changes, keyVersion, countVersion));
historyData.push({
version: countVersion,
key: key,
url: url
});
}
history.push(docManager.getHistory(fileName, changes, key, countVersion));
var argss = {
apiUrl: siteUrl + configServer.get('apiUrl'),
@ -521,10 +536,7 @@ app.get("/editor", function (req, res) {
plugins: JSON.stringify(plugins)
},
history: history,
setHistoryData: {
url: prevUrl,
changesUrl: diff
}
historyData: historyData
};
if (cfgSignatureEnable) {

9
web/documentserver-example/nodejs/views/editor.ejs
View File

@ -75,14 +75,9 @@
var onRequestHistoryData = function (data) {
var version = data.data;
var url_arr = "<%= setHistoryData.url %>".split(",");
var changesUrl_arr = "<%= setHistoryData.changesUrl %>".split(",");
var historyData = <%- JSON.stringify(historyData) %> || null;
docEditor.setHistoryData({
version: version,
url: url_arr[version - 1] != "" ? url_arr[version - 1] : null,
changesUrl: changesUrl_arr[version - 1] != "" ? changesUrl_arr[version - 1] : null
});
docEditor.setHistoryData(historyData[version-1]);
};
var onRequestHistoryClose = function (event){