Commit 83472756 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

need scroll to target: scroll if target change position

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57661 954022d7-b5bf-4e40-9824-e11837661b57
parent ff69a072
...@@ -1806,7 +1806,6 @@ function CDrawingDocument() ...@@ -1806,7 +1806,6 @@ function CDrawingDocument()
this.m_lTargetPage = -1; this.m_lTargetPage = -1;
this.m_dTargetSize = 1; this.m_dTargetSize = 1;
this.NeedScrollToTarget = true;
this.NeedScrollToTargetFlag = false; this.NeedScrollToTargetFlag = false;
this.TargetHtmlElement = null; this.TargetHtmlElement = null;
...@@ -2906,15 +2905,13 @@ function CDrawingDocument() ...@@ -2906,15 +2905,13 @@ function CDrawingDocument()
if (this.UpdateTargetFromPaint === false) if (this.UpdateTargetFromPaint === false)
{ {
this.UpdateTargetCheck = true; this.UpdateTargetCheck = true;
if (this.NeedScrollToTargetFlag && this.m_dTargetX == x && this.m_dTargetY == y && this.m_lTargetPage == pageIndex)
this.NeedScrollToTarget = false;
else
this.NeedScrollToTarget = true;
return; return;
} }
var bNeedScrollToTarget = true;
if (this.m_dTargetX == x && this.m_dTargetY == y && this.m_lTargetPage == pageIndex)
bNeedScrollToTarget = false;
if (-1 != this.m_lTimerUpdateTargetID) if (-1 != this.m_lTimerUpdateTargetID)
{ {
clearTimeout(this.m_lTimerUpdateTargetID); clearTimeout(this.m_lTimerUpdateTargetID);
...@@ -3002,7 +2999,7 @@ function CDrawingDocument() ...@@ -3002,7 +2999,7 @@ function CDrawingDocument()
nValueScrollVer = this.m_oWordControl.GetVerticalScrollTo(_mem, pageIndex); nValueScrollVer = this.m_oWordControl.GetVerticalScrollTo(_mem, pageIndex);
} }
if (!this.NeedScrollToTarget) if (!bNeedScrollToTarget)
{ {
nValueScrollHor = 0; nValueScrollHor = 0;
nValueScrollVer = 0; nValueScrollVer = 0;
......
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