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

1) исключено падение таймера отрисовки

2) исправлено определение "замороженной страницы"
parent 2c962e34
...@@ -2765,7 +2765,14 @@ function CDrawingDocument() ...@@ -2765,7 +2765,14 @@ function CDrawingDocument()
this.IsFreezePage = function(pageIndex) this.IsFreezePage = function(pageIndex)
{ {
if (pageIndex >= 0 && (pageIndex < Math.min(this.m_lCountCalculatePages, this.m_lPagesCount))) if (pageIndex >= 0 && (pageIndex < Math.min(this.m_lCountCalculatePages, this.m_lPagesCount)))
{
if (this.m_oLogicDocument)
{
if (pageIndex >= this.m_oLogicDocument.Pages.length)
return true;
}
return false; return false;
}
return true; return true;
} }
......
...@@ -3719,7 +3719,7 @@ function CEditorPage(api) ...@@ -3719,7 +3719,7 @@ function CEditorPage(api)
this.onTimerScroll2(); this.onTimerScroll2();
} }
this.onTimerScroll2 = function() this.onTimerScroll2_internal = function()
{ {
var oWordControl = oThis; var oWordControl = oThis;
...@@ -3790,6 +3790,16 @@ function CEditorPage(api) ...@@ -3790,6 +3790,16 @@ function CEditorPage(api)
this.m_nPaintTimerId = setTimeout(oWordControl.onTimerScroll2, oWordControl.m_nTimerScrollInterval); this.m_nPaintTimerId = setTimeout(oWordControl.onTimerScroll2, oWordControl.m_nTimerScrollInterval);
//window.requestAnimationFrame(oWordControl.onTimerScroll2); //window.requestAnimationFrame(oWordControl.onTimerScroll2);
} }
this.onTimerScroll2 = function()
{
try
{
oThis.onTimerScroll2_internal();
}
catch (err)
{
}
}
this.onTimerScroll2_sync = function() this.onTimerScroll2_sync = function()
{ {
......
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