lab.nexedi.com will be down from Thursday, 20 March 2025, 07:30:00 UTC for a duration of approximately 2 hours

Commit dcb42d5b authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

после перехода в version history openDocument приходил все кто находится в этом документе.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@65219 954022d7-b5bf-4e40-9824-e11837661b57
parent 28657cd1
...@@ -778,7 +778,7 @@ asc_docs_api.prototype.asc_setLocale = function(val) ...@@ -778,7 +778,7 @@ asc_docs_api.prototype.asc_setLocale = function(val)
{ {
this.InterfaceLocale = val; this.InterfaceLocale = val;
}; };
asc_docs_api.prototype.LoadDocument = function() { asc_docs_api.prototype.LoadDocument = function(isVersionHistory) {
this.CoAuthoringApi.auth(this.isViewMode); this.CoAuthoringApi.auth(this.isViewMode);
this.WordControl.m_oDrawingDocument.m_bIsOpeningDocument = true; this.WordControl.m_oDrawingDocument.m_bIsOpeningDocument = true;
...@@ -799,6 +799,11 @@ asc_docs_api.prototype.LoadDocument = function() { ...@@ -799,6 +799,11 @@ asc_docs_api.prototype.LoadDocument = function() {
"embeddedfonts": this.isUseEmbeddedCutFonts, "embeddedfonts": this.isUseEmbeddedCutFonts,
"viewmode": this.isViewMode "viewmode": this.isViewMode
}; };
if (isVersionHistory) {
//чтобы результат пришел только этому соединению, а не всем кто в документе
rData["userconnectionid"] = this.CoAuthoringApi.getUserConnectionId();
}
this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.Open); this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.Open);
sendCommand2(this, null, rData); sendCommand2(this, null, rData);
} else { } else {
...@@ -7352,7 +7357,7 @@ asc_docs_api.prototype.asc_showRevision = function(newObj) { ...@@ -7352,7 +7357,7 @@ asc_docs_api.prototype.asc_showRevision = function(newObj) {
this.DocInfo.put_Url(this.VersionHistory.url); this.DocInfo.put_Url(this.VersionHistory.url);
documentUrlChanges = this.VersionHistory.urlChanges; documentUrlChanges = this.VersionHistory.urlChanges;
this.asc_setDocInfo(this.DocInfo); this.asc_setDocInfo(this.DocInfo);
this.LoadDocument(); this.LoadDocument(true);
} else if (this.VersionHistory.currentChangeId < newObj.currentChangeId) { } else if (this.VersionHistory.currentChangeId < newObj.currentChangeId) {
// Нужно только добавить некоторые изменения // Нужно только добавить некоторые изменения
CollaborativeEditing.Clear_CollaborativeMarks(); CollaborativeEditing.Clear_CollaborativeMarks();
......
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