Commit 048ac6de authored by konovalovsergey's avatar konovalovsergey

add serverVersion param for version history

parent 343aa07e
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
this.changes = null; this.changes = null;
this.token = null; this.token = null;
this.isRequested = null; this.isRequested = null;
this.serverVersion = null;
if (newObj) { if (newObj) {
this.update(newObj); this.update(newObj);
...@@ -66,6 +67,7 @@ ...@@ -66,6 +67,7 @@
this.colors = newObj.colors; this.colors = newObj.colors;
this.newChangeId = newObj.currentChangeId; this.newChangeId = newObj.currentChangeId;
this.isRequested = newObj.isRequested; this.isRequested = newObj.isRequested;
this.serverVersion = newObj.serverVersion;
return bUpdate; return bUpdate;
}; };
asc_CVersionHistory.prototype.applyChanges = function(editor) { asc_CVersionHistory.prototype.applyChanges = function(editor) {
...@@ -98,6 +100,9 @@ ...@@ -98,6 +100,9 @@
asc_CVersionHistory.prototype.asc_setIsRequested = function(val) { asc_CVersionHistory.prototype.asc_setIsRequested = function(val) {
this.isRequested = val; this.isRequested = val;
}; };
asc_CVersionHistory.prototype.asc_setServerVersion = function(val) {
this.serverVersion = val;
};
window["Asc"].asc_CVersionHistory = window["Asc"]["asc_CVersionHistory"] = asc_CVersionHistory; window["Asc"].asc_CVersionHistory = window["Asc"]["asc_CVersionHistory"] = asc_CVersionHistory;
prot = asc_CVersionHistory.prototype; prot = asc_CVersionHistory.prototype;
...@@ -108,6 +113,7 @@ ...@@ -108,6 +113,7 @@
prot["asc_setArrColors"] = prot.asc_setArrColors; prot["asc_setArrColors"] = prot.asc_setArrColors;
prot["asc_setToken"] = prot.asc_setToken; prot["asc_setToken"] = prot.asc_setToken;
prot["asc_setIsRequested"] = prot.asc_setIsRequested; prot["asc_setIsRequested"] = prot.asc_setIsRequested;
prot["asc_setServerVersion"] = prot.asc_setServerVersion;
})(window); })(window);
AscCommon.baseEditorsApi.prototype.asc_showRevision = function(newObj) { AscCommon.baseEditorsApi.prototype.asc_showRevision = function(newObj) {
......
...@@ -442,6 +442,7 @@ ...@@ -442,6 +442,7 @@
}; };
if (versionHistory) if (versionHistory)
{ {
rData["serverVersion"] = versionHistory.serverVersion;
rData["closeonerror"] = versionHistory.isRequested; rData["closeonerror"] = versionHistory.isRequested;
rData["jwt"] = versionHistory.token; rData["jwt"] = versionHistory.token;
//чтобы результат пришел только этому соединению, а не всем кто в документе //чтобы результат пришел только этому соединению, а не всем кто в документе
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment