Commit 1170acd5 authored by SergeyLuzyanin's avatar SergeyLuzyanin

bugs in collaborative cursors in notes

parent 0558a8f2
...@@ -526,10 +526,10 @@ CCollaborativeEditing.prototype.Update_ForeignCursorsPositions = function() ...@@ -526,10 +526,10 @@ CCollaborativeEditing.prototype.Update_ForeignCursorsPositions = function()
{ {
var DrawingDocument = editor.WordControl.m_oDrawingDocument; var DrawingDocument = editor.WordControl.m_oDrawingDocument;
var oPresentation = editor.WordControl.m_oLogicDocument; var oPresentation = editor.WordControl.m_oLogicDocument;
var oCurSlide = oPresentation.Slides[oPresentation.CurPage];
var oTargetDocContentOrTable; var oTargetDocContentOrTable;
if(oCurSlide){ var oCurController = oPresentation.GetCurrentController();
oTargetDocContentOrTable = oCurSlide.graphicObjects.getTargetDocContent(undefined, true); if(oCurController){
oTargetDocContentOrTable = oCurController.getTargetDocContent(undefined, true);
} }
if(!oTargetDocContentOrTable){ if(!oTargetDocContentOrTable){
for (var UserId in this.m_aForeignCursors){ for (var UserId in this.m_aForeignCursors){
......
...@@ -1435,7 +1435,7 @@ CPresentation.prototype = ...@@ -1435,7 +1435,7 @@ CPresentation.prototype =
if (true === Show){ if (true === Show){
var oTargetDocContentOrTable, oCurSlide = this.Slides[this.CurPage]; var oTargetDocContentOrTable;
var oController = this.GetCurrentController(); var oController = this.GetCurrentController();
if(oController){ if(oController){
oTargetDocContentOrTable = oController.getTargetDocContent(undefined, true); oTargetDocContentOrTable = oController.getTargetDocContent(undefined, true);
...@@ -4303,6 +4303,9 @@ CPresentation.prototype = ...@@ -4303,6 +4303,9 @@ CPresentation.prototype =
Notes_Draw: function(SlideIndex, graphics){ Notes_Draw: function(SlideIndex, graphics){
if(this.Slides[SlideIndex]){ if(this.Slides[SlideIndex]){
if(!graphics.IsSlideBoundsCheckerType){
AscCommon.CollaborativeEditing.Update_ForeignCursorsPositions();
}
this.Slides[SlideIndex].drawNotes(graphics); this.Slides[SlideIndex].drawNotes(graphics);
} }
}, },
......
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