Commit 5958db5f authored by Alexey.Musinov's avatar Alexey.Musinov

collaboration targets (ios)

parent 4dc67f23
......@@ -1635,6 +1635,8 @@ CDrawingDocument.prototype =
this.InlineTextTrack.transform);
}
this.Collaborative_TargetsUpdate();
this.Native["DD_Overlay_DrawHorVerAnchor"]();
this.Native["DD_Overlay_UpdateEnd"]();
......@@ -3036,8 +3038,26 @@ CDrawingDocument.prototype =
if (is_from_paint !== true)
{
this.CollaborativeTargetsUpdateTasks.push([_id, _shortId, _x, _y, _size, _page, _transform]);
this.OnUpdateOverlay();
this.EndUpdateOverlay();
return;
}
else
{
var color = AscCommon.getUserColorById(_shortId, null, true);
if (null != _transform) {
this.Native["collaborativeUpdateTarget"](_id, _shortId, _x, _y, _size, _page,
_transform.sx, _transform.shy, _transform.shx, _transform.sy, _transform.tx, _transform.ty,
color.r, color.g, color.b
);
} else {
this.Native["collaborativeUpdateTarget"](_id, _shortId, _x, _y, _size, _page,
1.0, 0.0, 0.0, 1.0, 0.0, 0.0,
color.r, color.g, color.b
);
}
}
for (var i = 0; i < this.CollaborativeTargets.length; i++)
{
......@@ -3055,7 +3075,9 @@ CDrawingDocument.prototype =
},
Collaborative_RemoveTarget : function (_id)
{
for (var i = 0; i < this.CollaborativeTargets.length; i++)
//this.Native["collaborativeRemoveTarget"](_id);
for (var i = 0; i < this.CollaborativeTargets.length; i++)
{
if (_id == this.CollaborativeTargets[i].Id)
{
......@@ -3063,6 +3085,9 @@ CDrawingDocument.prototype =
this.CollaborativeTargets.splice(i, 1);
}
}
this.OnUpdateOverlay();
this.EndUpdateOverlay();
},
Collaborative_TargetsUpdate : function (bIsChangePosition)
{
......
......@@ -120,6 +120,8 @@ Asc['asc_docs_api'].prototype["Call_CheckTargetUpdate"] = function()
this.WordControl.m_oLogicDocument.CheckTargetUpdate();
this.WordControl.m_oDrawingDocument.CheckTargetShow();
this.WordControl.m_oDrawingDocument.UpdateTargetFromPaint = false;
this.WordControl.m_oDrawingDocument.Collaborative_TargetsUpdate(false);
};
Asc['asc_docs_api'].prototype["Call_Common"] = function(type, param)
......@@ -6067,6 +6069,8 @@ Asc['asc_docs_api'].prototype.openDocument = function(sData)
window["native"]["onEndLoadingFile"]();
this.WordControl.m_oDrawingDocument.Collaborative_TargetsUpdate(true);
var t = this;
setInterval(function() {
t._autoSave();
......
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