Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
5013e5c4
Commit
5013e5c4
authored
Apr 28, 2016
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
не прокручивался наверх документ в десктопе (вьюер)
parent
956e179d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
slide/Drawing/Transitions.js
slide/Drawing/Transitions.js
+2
-1
word/Drawing/HtmlPage.js
word/Drawing/HtmlPage.js
+8
-0
No files found.
slide/Drawing/Transitions.js
View file @
5013e5c4
...
@@ -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
||
...
...
word/Drawing/HtmlPage.js
View file @
5013e5c4
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment