Commit 7d29c41e authored by Oleg Korshul's avatar Oleg Korshul

.

parent eadc8802
......@@ -2892,11 +2892,7 @@ function CEditorPage(api)
this.m_oBoundsController.ClearNoAttack();
this.onTimerScroll_sync();
if (this.m_bIsRuler)
{
this.UpdateHorRulerBack(true);
this.UpdateVerRulerBack(true);
}
this.FullRulersUpdate();
return;
}
}
......@@ -2907,27 +2903,11 @@ function CEditorPage(api)
this.m_oBoundsController.ClearNoAttack();
this.onTimerScroll_sync();
if (this.m_bIsRuler)
{
this.UpdateHorRulerBack(true);
this.UpdateVerRulerBack(true);
}
this.FullRulersUpdate();
return;
}
}
this.m_bIsUpdateHorRuler = true;
this.m_bIsUpdateVerRuler = true;
if (this.m_bIsRuler)
{
this.UpdateHorRulerBack(true);
this.UpdateVerRulerBack(true);
}
this.m_oHorRuler.RepaintChecker.BlitAttack = true;
this.m_oVerRuler.RepaintChecker.BlitAttack = true;
this.Thumbnails.m_bIsUpdate = true;
this.CalculateDocumentSize();
......@@ -2946,6 +2926,23 @@ function CEditorPage(api)
if (this.IsSupportNotes && this.m_oNotesApi)
this.m_oNotesApi.OnResize();
this.FullRulersUpdate();
};
this.FullRulersUpdate = function()
{
this.m_oHorRuler.RepaintChecker.BlitAttack = true;
this.m_oVerRuler.RepaintChecker.BlitAttack = true;
this.m_bIsUpdateHorRuler = true;
this.m_bIsUpdateVerRuler = true;
if (this.m_bIsRuler)
{
this.UpdateHorRulerBack(true);
this.UpdateVerRulerBack(true);
}
};
this.OnResizeReporter = function()
......@@ -3013,6 +3010,8 @@ function CEditorPage(api)
{
this.m_oBoundsController.ClearNoAttack();
this.onTimerScroll_sync();
this.FullRulersUpdate();
return;
}
}
......@@ -3022,6 +3021,8 @@ function CEditorPage(api)
{
this.m_oBoundsController.ClearNoAttack();
this.onTimerScroll_sync();
this.FullRulersUpdate();
return;
}
}
......@@ -3046,6 +3047,8 @@ function CEditorPage(api)
if (this.IsSupportNotes && this.m_oNotesApi)
this.m_oNotesApi.OnResize();
this.FullRulersUpdate();
};
this.checkNeedRules = function()
......
......@@ -2981,6 +2981,7 @@ function CDemonstrationManager(htmlpage)
//oThis.DemonstrationDivEndPresentation.onmousedown = oThis.onMouseDownDemonstration;
//oThis.DemonstrationDivEndPresentation.onmousemove = oThis.onMouseMoveDemonstration;
oThis.DivEndPresentation.onmousedown = oThis.onMouseDown;
oThis.DivEndPresentation.onmouseup = oThis.onMouseUp;
oThis.DivEndPresentation.onmousewheel = oThis.onMouseWhell;
......@@ -3414,9 +3415,9 @@ function CDemonstrationManager(htmlpage)
return false;
}
this.onMouseUp = function(e)
this.onMouseUp = function(e, isAttack)
{
if (!oThis.isMouseDown)
if (!oThis.isMouseDown && true !== isAttack)
return;
oThis.isMouseDown = false;
......
......@@ -6113,7 +6113,7 @@ background-repeat: no-repeat;\
}
else if (undefined !== _obj["mouseUp"])
{
_this.WordControl.DemonstrationManager.onMouseUp({});
_this.WordControl.DemonstrationManager.onMouseUp({}, true);
}
else if (undefined !== _obj["mouseWhell"])
{
......
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