Commit 5013e5c4 authored by Oleg Korshul's avatar Oleg Korshul

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

parent 956e179d
...@@ -44,7 +44,8 @@ var __nextFrame = (function() { ...@@ -44,7 +44,8 @@ var __nextFrame = (function() {
})(); })();
var __cancelFrame = (function () { var __cancelFrame = (function () {
return window.cancelRequestAnimationFrame || return window.cancelAnimationFrame ||
window.cancelRequestAnimationFrame ||
window.webkitCancelAnimationFrame || window.webkitCancelAnimationFrame ||
window.webkitCancelRequestAnimationFrame || window.webkitCancelRequestAnimationFrame ||
window.mozCancelRequestAnimationFrame || window.mozCancelRequestAnimationFrame ||
......
...@@ -1523,6 +1523,14 @@ function CEditorPage(api) ...@@ -1523,6 +1523,14 @@ function CEditorPage(api)
positionMinY = (oWordControl.m_oMainContent.AbsolutePosition.T + oWordControl.m_oTopRuler_horRuler.AbsolutePosition.B) * g_dKoef_mm_to_pix + positionMinY = (oWordControl.m_oMainContent.AbsolutePosition.T + oWordControl.m_oTopRuler_horRuler.AbsolutePosition.B) * g_dKoef_mm_to_pix +
oWordControl.Y; oWordControl.Y;
// если находимся в самом верху (без тулбара) - то наверх не будем скроллиться
// делаем заглушку
var minPosY = 20;
if (oThis.bIsRetinaSupport)
minPosY *= 2;
if (positionMinY < minPosY)
positionMinY = minPosY;
var positionMaxY = oWordControl.m_oMainContent.AbsolutePosition.B * g_dKoef_mm_to_pix + oWordControl.Y; var positionMaxY = oWordControl.m_oMainContent.AbsolutePosition.B * g_dKoef_mm_to_pix + oWordControl.Y;
var scrollYVal = 0; var scrollYVal = 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