Commit dd72096e authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Подсвечиваем только последние изменения пользователя в документе при просмотре версий.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63090 954022d7-b5bf-4e40-9824-e11837661b57
parent 61d10b79
...@@ -2558,9 +2558,9 @@ ...@@ -2558,9 +2558,9 @@
this.newChangeId = (null == this.newChangeId) ? (this.changes.length - 1) : this.newChangeId; this.newChangeId = (null == this.newChangeId) ? (this.changes.length - 1) : this.newChangeId;
for (var i = this.currentChangeId + 1; i <= this.newChangeId && i < this.changes.length; ++i) { for (var i = this.currentChangeId + 1; i <= this.newChangeId && i < this.changes.length; ++i) {
color = this.colors[i]; color = this.colors[i];
editor._coAuthoringSetChanges(this.changes[i], color ? editor._coAuthoringSetChanges(this.changes[i], i !== this.newChangeId ? null : (color ?
new CDocumentColor((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF) : new CDocumentColor((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF) :
new CDocumentColor(191, 255, 199)); new CDocumentColor(191, 255, 199)));
} }
this.currentChangeId = this.newChangeId; this.currentChangeId = this.newChangeId;
}; };
......
...@@ -7477,6 +7477,7 @@ asc_docs_api.prototype.asc_showRevision = function (newObj) { ...@@ -7477,6 +7477,7 @@ asc_docs_api.prototype.asc_showRevision = function (newObj) {
this.LoadDocument(); this.LoadDocument();
} else if (this.VersionHistory.currentChangeId < newObj.currentChangeId) { } else if (this.VersionHistory.currentChangeId < newObj.currentChangeId) {
// Нужно только добавить некоторые изменения // Нужно только добавить некоторые изменения
CollaborativeEditing.Clear_CollaborativeMarks();
editor.VersionHistory.applyChanges(editor); editor.VersionHistory.applyChanges(editor);
CollaborativeEditing.Apply_Changes(); CollaborativeEditing.Apply_Changes();
} }
......
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