Commit 27aa2485 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Сделано, чтобы при переходе из быстрого в обычное совместное редактирование...

Сделано, чтобы при переходе из быстрого в обычное совместное редактирование убирались чужие курсоры (баг 30910). 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66256 954022d7-b5bf-4e40-9824-e11837661b57
parent bbdf315d
...@@ -260,6 +260,9 @@ CCollaborativeEditingBase.prototype.Clear = function() ...@@ -260,6 +260,9 @@ CCollaborativeEditingBase.prototype.Clear = function()
CCollaborativeEditingBase.prototype.Set_Fast = function(bFast) CCollaborativeEditingBase.prototype.Set_Fast = function(bFast)
{ {
this.m_bFast = bFast; this.m_bFast = bFast;
if (false === bFast)
this.Remove_AllForeignCursors();
}; };
CCollaborativeEditingBase.prototype.Is_Fast = function() CCollaborativeEditingBase.prototype.Is_Fast = function()
{ {
...@@ -661,6 +664,7 @@ CCollaborativeEditingBase.prototype.Remove_ForeignCursor = function(UserId){ ...@@ -661,6 +664,7 @@ CCollaborativeEditingBase.prototype.Remove_ForeignCursor = function(UserId){
this.m_aForeignCursorsPos.Remove_DocumentPosition(this.m_aCursorsToUpdate[UserId]); this.m_aForeignCursorsPos.Remove_DocumentPosition(this.m_aCursorsToUpdate[UserId]);
delete this.m_aForeignCursors[UserId]; delete this.m_aForeignCursors[UserId];
}; };
CCollaborativeEditingBase.prototype.Remove_AllForeignCursors = function(){};
CCollaborativeEditingBase.prototype.Update_DocumentPositionsOnAdd = function(Class, Pos){ CCollaborativeEditingBase.prototype.Update_DocumentPositionsOnAdd = function(Class, Pos){
this.m_aDocumentPositions.Update_DocumentPositionsOnAdd(Class, Pos); this.m_aDocumentPositions.Update_DocumentPositionsOnAdd(Class, Pos);
this.m_aForeignCursorsPos.Update_DocumentPositionsOnAdd(Class, Pos); this.m_aForeignCursorsPos.Update_DocumentPositionsOnAdd(Class, Pos);
......
...@@ -303,6 +303,13 @@ CWordCollaborativeEditing.prototype.Remove_ForeignCursor = function(UserId) ...@@ -303,6 +303,13 @@ CWordCollaborativeEditing.prototype.Remove_ForeignCursor = function(UserId)
this.Remove_ForeignCursorXY(UserId); this.Remove_ForeignCursorXY(UserId);
this.Remove_ForeignCursorToShow(UserId); this.Remove_ForeignCursorToShow(UserId);
}; };
CWordCollaborativeEditing.prototype.Remove_AllForeignCursors = function()
{
for (var UserId in this.m_aForeignCursors)
{
this.Remove_ForeignCursor(UserId);
}
};
CWordCollaborativeEditing.prototype.Update_DocumentPositionsOnAdd = function(Class, Pos) CWordCollaborativeEditing.prototype.Update_DocumentPositionsOnAdd = function(Class, Pos)
{ {
this.m_aDocumentPositions.Update_DocumentPositionsOnAdd(Class, Pos); this.m_aDocumentPositions.Update_DocumentPositionsOnAdd(Class, Pos);
......
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