target update

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58268 954022d7-b5bf-4e40-9824-e11837661b57

Common/Native/Wrappers/DrawingDocument.js

@@ -558,6 +558,11 @@ function CDrawingDocument()
     this.IsUpdateOverlayOnlyEndReturn   = false;
     this.IsUpdateOverlayOnEndCheck      = false;
 
+    this.UpdateTargetFromPaint  = false;
+    this.UpdateTargetCheck      = true;
+    this.TargetShowNeedFlag     = false;
+    this.TargetShowNeedFlag     = false;
+
     this.m_bIsSelection         = false;
     this.m_bIsMouseLock         = false;
 
@@ -723,6 +728,8 @@ CDrawingDocument.prototype =
     },
     TargetEnd : function()
     {
+        this.TargetShowFlag = false;
+        this.TargetShowNeedFlag = false;
         this.Native["DD_TargetEnd"]();
     },
     SetTargetColor : function(r, g, b)
@@ -739,6 +746,7 @@ CDrawingDocument.prototype =
     UpdateTarget : function(x, y, pageIndex)
     {
         this.LogicDocument.Set_TargetPos( x, y, pageIndex );
+        this.UpdateTargetCheck = true;
         this.Native["DD_UpdateTarget"](x, y, pageIndex);
     },
     SetTargetSize : function(size)
@@ -747,8 +755,29 @@ CDrawingDocument.prototype =
         this.Native["DD_SetTargetSize"](size);
     },
     TargetShow : function()
+    {
+        this.TargetShowNeedFlag = true;
+        //this.Native["DD_TargetShow"]();
+    },
+    CheckTargetShow : function()
+    {
+        if (this.TargetShowFlag && this.TargetShowNeedFlag)
         {
             this.Native["DD_TargetShow"]();
+            this.TargetShowNeedFlag = false;
+            return;
+        }
+
+        if (!this.TargetShowNeedFlag)
+            return;
+
+        this.TargetShowNeedFlag = false;
+
+        this.TargetStart();
+
+        this.Native["DD_TargetShow"]();
+
+        this.TargetShowFlag = true;
     },
 
     // track images

Common/Native/Wrappers/api.js

@@ -77,7 +77,10 @@ asc_docs_api.prototype["Call_TurnOnRecalculate"] = function()
 
 asc_docs_api.prototype["Call_CheckTargetUpdate"] = function()
 {
+    this.WordControl.m_oDrawingDocument.UpdateTargetFromPaint = true;
     this.WordControl.m_oLogicDocument.CheckTargetUpdate();
+    this.WordControl.m_oDrawingDocument.CheckTargetShow();
+    this.WordControl.m_oDrawingDocument.UpdateTargetFromPaint = false;
 };
 
 asc_docs_api.prototype["Call_HR_Tabs"] = function(arrT, arrP)