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

убрано отключение пересчета при вводе с клавы (были падения - потом посмотреть)

пересчет как в веб версии - на таймере

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@61423 954022d7-b5bf-4e40-9824-e11837661b57
parent ada8185c
...@@ -1892,7 +1892,10 @@ CDrawingDocument.prototype = ...@@ -1892,7 +1892,10 @@ CDrawingDocument.prototype =
var _len = _params.length / 4; var _len = _params.length / 4;
this.LogicDocument.TurnOff_Recalculate(); //this.LogicDocument.TurnOff_Recalculate();
// если выключить - падает на некоторых документах. Например в списке если заселектить
// несколько параграфов и ввести букву
this.LogicDocument.TurnOff_InterfaceEvents(); this.LogicDocument.TurnOff_InterfaceEvents();
this.StartUpdateOverlay(); this.StartUpdateOverlay();
...@@ -1930,7 +1933,7 @@ CDrawingDocument.prototype = ...@@ -1930,7 +1933,7 @@ CDrawingDocument.prototype =
this.EndUpdateOverlay(); this.EndUpdateOverlay();
this.LogicDocument.TurnOn_Recalculate(true); //this.LogicDocument.TurnOn_Recalculate(true);
this.LogicDocument.TurnOn_InterfaceEvents(true); this.LogicDocument.TurnOn_InterfaceEvents(true);
}, },
......
...@@ -1498,9 +1498,15 @@ CDocument.prototype = ...@@ -1498,9 +1498,15 @@ CDocument.prototype =
{ {
if ( PageIndex + 1 > this.FullRecalc.StartPage + 2 ) if ( PageIndex + 1 > this.FullRecalc.StartPage + 2 )
{ {
if (window["native"]["WC_CheckSuspendRecalculate"] && window["native"]["WC_CheckSuspendRecalculate"]()) if (window["native"]["WC_CheckSuspendRecalculate"] !== undefined)
{
//if (window["native"]["WC_CheckSuspendRecalculate"]())
// return;
this.FullRecalc.Id = setTimeout( Document_Recalculate_Page, 10 );
return; return;
} }
}
this.Recalculate_Page(); this.Recalculate_Page();
return; return;
...@@ -2136,9 +2142,15 @@ CDocument.prototype = ...@@ -2136,9 +2142,15 @@ CDocument.prototype =
{ {
if ( _PageIndex > this.FullRecalc.StartPage + 2 ) if ( _PageIndex > this.FullRecalc.StartPage + 2 )
{ {
if (window["native"]["WC_CheckSuspendRecalculate"] && window["native"]["WC_CheckSuspendRecalculate"]()) if (window["native"]["WC_CheckSuspendRecalculate"] !== undefined)
{
//if (window["native"]["WC_CheckSuspendRecalculate"]())
// return;
this.FullRecalc.Id = setTimeout( Document_Recalculate_Page, 10 );
return; return;
} }
}
this.Recalculate_Page(); this.Recalculate_Page();
return; return;
......
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