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
7d0c2891
Commit
7d0c2891
authored
Apr 21, 2016
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
scroll iscroll to function-closure
parent
25026b5b
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
73 additions
and
58 deletions
+73
-58
build/configs/webexcel.json
build/configs/webexcel.json
+4
-3
build/configs/webpowerpoint.json
build/configs/webpowerpoint.json
+3
-2
build/configs/webword.json
build/configs/webword.json
+4
-3
cell/view/EventsController.js
cell/view/EventsController.js
+2
-2
cell/view/iscroll.js
cell/view/iscroll.js
+3
-2
cell/view/mobileTouch.js
cell/view/mobileTouch.js
+2
-2
common/Scrolls/iscroll.js
common/Scrolls/iscroll.js
+4
-3
common/scroll.js
common/scroll.js
+43
-33
slide/Drawing/DrawingDocument.js
slide/Drawing/DrawingDocument.js
+1
-1
slide/Drawing/HtmlPage.js
slide/Drawing/HtmlPage.js
+3
-3
word/Drawing/HtmlPage.js
word/Drawing/HtmlPage.js
+2
-2
word/Drawing/WorkEvents.js
word/Drawing/WorkEvents.js
+2
-2
No files found.
build/configs/webexcel.json
View file @
7d0c2891
...
@@ -13,8 +13,12 @@
...
@@ -13,8 +13,12 @@
"../common/NumFormat.js"
,
"../common/NumFormat.js"
,
"../common/Drawings/Format/Constants.js"
,
"../common/Drawings/Format/Constants.js"
,
"../common/Drawings/Format/Format.js"
,
"../common/Charts/charts.js"
,
"../common/Charts/charts.js"
,
"../common/scroll.js"
,
"../cell/view/iscroll.js"
,
"../common/wordcopypaste.js"
,
"../common/wordcopypaste.js"
,
"../cell/apiDefines.js"
,
"../cell/apiDefines.js"
,
...
@@ -61,7 +65,6 @@
...
@@ -61,7 +65,6 @@
"../cell/model/History.js"
,
"../cell/model/History.js"
,
"../cell/model/CellComment.js"
,
"../cell/model/CellComment.js"
,
"../cell/view/mobileTouch.js"
,
"../cell/view/mobileTouch.js"
,
"../cell/view/iscroll.js"
,
"../cell/view/StringRender.js"
,
"../cell/view/StringRender.js"
,
"../cell/view/CellTextRender.js"
,
"../cell/view/CellTextRender.js"
,
"../cell/view/CellEditorView.js"
,
"../cell/view/CellEditorView.js"
,
...
@@ -69,7 +72,6 @@
...
@@ -69,7 +72,6 @@
"../cell/view/HandlerList.js"
,
"../cell/view/HandlerList.js"
,
"../cell/view/EventsController.js"
,
"../cell/view/EventsController.js"
,
"../cell/view/WorkbookView.js"
,
"../cell/view/WorkbookView.js"
,
"../common/scroll.js"
,
"../word/Editor/SerializeCommon.js"
,
"../word/Editor/SerializeCommon.js"
,
"../common/Drawings/Math.js"
,
"../common/Drawings/Math.js"
,
"../common/Drawings/ArcTo.js"
,
"../common/Drawings/ArcTo.js"
,
...
@@ -89,7 +91,6 @@
...
@@ -89,7 +91,6 @@
"../common/Drawings/TrackObjects/Spline.js"
,
"../common/Drawings/TrackObjects/Spline.js"
,
"../common/Drawings/TrackObjects/MoveTracks.js"
,
"../common/Drawings/TrackObjects/MoveTracks.js"
,
"../common/Drawings/CommonController.js"
,
"../common/Drawings/CommonController.js"
,
"../common/Drawings/Format/Format.js"
,
"../common/Drawings/Format/CreateGeometry.js"
,
"../common/Drawings/Format/CreateGeometry.js"
,
"../common/Drawings/Format/Geometry.js"
,
"../common/Drawings/Format/Geometry.js"
,
"../common/Drawings/Format/Path.js"
,
"../common/Drawings/Format/Path.js"
,
...
...
build/configs/webpowerpoint.json
View file @
7d0c2891
...
@@ -13,8 +13,11 @@
...
@@ -13,8 +13,11 @@
"../common/NumFormat.js"
,
"../common/NumFormat.js"
,
"../common/Drawings/Format/Constants.js"
,
"../common/Drawings/Format/Constants.js"
,
"../common/Drawings/Format/Format.js"
,
"../common/Charts/charts.js"
,
"../common/Charts/charts.js"
,
"../common/scroll.js"
,
"../common/wordcopypaste.js"
,
"../common/wordcopypaste.js"
,
"../slide/apiDefines.js"
,
"../slide/apiDefines.js"
,
...
@@ -48,7 +51,6 @@
...
@@ -48,7 +51,6 @@
"../word/Editor/Table/TableCell.js"
,
"../word/Editor/Table/TableCell.js"
,
"../word/Editor/Common.js"
,
"../word/Editor/Common.js"
,
"../word/Editor/Sections.js"
,
"../word/Editor/Sections.js"
,
"../common/scroll.js"
,
"../word/Editor/History.js"
,
"../word/Editor/History.js"
,
"../common/Drawings/Hit.js"
,
"../common/Drawings/Hit.js"
,
"../common/Drawings/States.js"
,
"../common/Drawings/States.js"
,
...
@@ -77,7 +79,6 @@
...
@@ -77,7 +79,6 @@
"../common/Drawings/CommonController.js"
,
"../common/Drawings/CommonController.js"
,
"../cell/view/DrawingObjectsController.js"
,
"../cell/view/DrawingObjectsController.js"
,
"../slide/Editor/DrawingObjectsController.js"
,
"../slide/Editor/DrawingObjectsController.js"
,
"../common/Drawings/Format/Format.js"
,
"../common/Drawings/Format/CreateGeometry.js"
,
"../common/Drawings/Format/CreateGeometry.js"
,
"../common/Drawings/Format/Geometry.js"
,
"../common/Drawings/Format/Geometry.js"
,
"../common/Drawings/Format/Path.js"
,
"../common/Drawings/Format/Path.js"
,
...
...
build/configs/webword.json
View file @
7d0c2891
...
@@ -16,8 +16,12 @@
...
@@ -16,8 +16,12 @@
"../common/NumFormat.js"
,
"../common/NumFormat.js"
,
"../common/Drawings/Format/Constants.js"
,
"../common/Drawings/Format/Constants.js"
,
"../common/Drawings/Format/Format.js"
,
"../common/Charts/charts.js"
,
"../common/Charts/charts.js"
,
"../common/scroll.js"
,
"../common/Scrolls/iscroll.js"
,
"../common/wordcopypaste.js"
,
"../common/wordcopypaste.js"
,
"../word/apiDefines.js"
,
"../word/apiDefines.js"
,
...
@@ -25,7 +29,6 @@
...
@@ -25,7 +29,6 @@
"../common/Shapes/SerializeWriter.js"
,
"../common/Shapes/SerializeWriter.js"
,
"../common/SerializeCommonWordExcel.js"
,
"../common/SerializeCommonWordExcel.js"
,
"../common/SerializeChart.js"
,
"../common/SerializeChart.js"
,
"../common/Drawings/Format/Format.js"
,
"../common/FontsFreeType/font_engine.js"
,
"../common/FontsFreeType/font_engine.js"
,
"../common/FontsFreeType/FontFile.js"
,
"../common/FontsFreeType/FontFile.js"
,
"../common/FontsFreeType/FontManager.js"
,
"../common/FontsFreeType/FontManager.js"
,
...
@@ -106,13 +109,11 @@
...
@@ -106,13 +109,11 @@
"../common/CollaborativeEditingBase.js"
,
"../common/CollaborativeEditingBase.js"
,
"../word/Drawing/DrawingDocument.js"
,
"../word/Drawing/DrawingDocument.js"
,
"../word/Drawing/GraphicsEvents.js"
,
"../word/Drawing/GraphicsEvents.js"
,
"../common/Scrolls/iscroll.js"
,
"../word/Drawing/WorkEvents.js"
,
"../word/Drawing/WorkEvents.js"
,
"../common/Controls.js"
,
"../common/Controls.js"
,
"../word/Drawing/Rulers.js"
,
"../word/Drawing/Rulers.js"
,
"../word/Drawing/HtmlPage.js"
,
"../word/Drawing/HtmlPage.js"
,
"../word/Drawing/documentrenderer.js"
,
"../word/Drawing/documentrenderer.js"
,
"../common/scroll.js"
,
"../word/Editor/SerializeCommon.js"
,
"../word/Editor/SerializeCommon.js"
,
"../common/apiBase.js"
,
"../common/apiBase.js"
,
"../word/api.js"
,
"../word/api.js"
,
...
...
cell/view/EventsController.js
View file @
7d0c2891
...
@@ -373,7 +373,7 @@
...
@@ -373,7 +373,7 @@
this
.
vsbHSt
=
document
.
getElementById
(
"
ws-v-scroll-helper
"
).
style
;
this
.
vsbHSt
=
document
.
getElementById
(
"
ws-v-scroll-helper
"
).
style
;
if
(
!
this
.
vsbApi
)
{
if
(
!
this
.
vsbApi
)
{
this
.
vsbApi
=
new
ScrollObject
(
this
.
vsb
.
id
,
opt
);
this
.
vsbApi
=
new
AscCommon
.
ScrollObject
(
this
.
vsb
.
id
,
opt
);
this
.
vsbApi
.
bind
(
"
scrollvertical
"
,
function
(
evt
)
{
this
.
vsbApi
.
bind
(
"
scrollvertical
"
,
function
(
evt
)
{
self
.
handlers
.
trigger
(
"
scrollY
"
,
evt
.
scrollPositionY
/
opt
.
vscrollStep
);
self
.
handlers
.
trigger
(
"
scrollY
"
,
evt
.
scrollPositionY
/
opt
.
vscrollStep
);
});
});
...
@@ -396,7 +396,7 @@
...
@@ -396,7 +396,7 @@
this
.
hsbHSt
=
document
.
getElementById
(
"
ws-h-scroll-helper
"
).
style
;
this
.
hsbHSt
=
document
.
getElementById
(
"
ws-h-scroll-helper
"
).
style
;
if
(
!
this
.
hsbApi
)
{
if
(
!
this
.
hsbApi
)
{
this
.
hsbApi
=
new
ScrollObject
(
this
.
hsb
.
id
,
$
.
extend
(
true
,
{},
opt
,
{
wheelScrollLines
:
1
}));
this
.
hsbApi
=
new
AscCommon
.
ScrollObject
(
this
.
hsb
.
id
,
$
.
extend
(
true
,
{},
opt
,
{
wheelScrollLines
:
1
}));
this
.
hsbApi
.
bind
(
"
scrollhorizontal
"
,
function
(
evt
)
{
this
.
hsbApi
.
bind
(
"
scrollhorizontal
"
,
function
(
evt
)
{
self
.
handlers
.
trigger
(
"
scrollX
"
,
evt
.
scrollPositionX
/
opt
.
hscrollStep
);
self
.
handlers
.
trigger
(
"
scrollX
"
,
evt
.
scrollPositionX
/
opt
.
hscrollStep
);
});
});
...
...
cell/view/iscroll.js
View file @
7d0c2891
...
@@ -1254,6 +1254,7 @@
...
@@ -1254,6 +1254,7 @@
dummyStyle
=
null
;
// for the sake of it
dummyStyle
=
null
;
// for the sake of it
window
.
CTouchScroll
=
CTouchScroll
;
//---------------------------------------------------------export---------------------------------------------------
window
.
CTouchScroll
;
window
[
'
AscCommonExcel
'
]
=
window
[
'
AscCommonExcel
'
]
||
{};
window
[
"
AscCommonExcel
"
].
CTouchScroll
=
CTouchScroll
;
})(
window
,
document
);
})(
window
,
document
);
cell/view/mobileTouch.js
View file @
7d0c2891
...
@@ -90,7 +90,7 @@ function CMobileTouchManager()
...
@@ -90,7 +90,7 @@ function CMobileTouchManager()
this
.
longTapFlag
=
false
;
this
.
longTapFlag
=
false
;
this
.
longTapTimer
=
-
1
;
this
.
longTapTimer
=
-
1
;
this
.
mylatesttap
=
null
this
.
mylatesttap
=
null
;
this
.
zoomFactor
=
1
;
this
.
zoomFactor
=
1
;
this
.
wasZoom
=
false
;
this
.
wasZoom
=
false
;
this
.
canZoom
=
true
;
this
.
canZoom
=
true
;
...
@@ -99,7 +99,7 @@ function CMobileTouchManager()
...
@@ -99,7 +99,7 @@ function CMobileTouchManager()
CMobileTouchManager
.
prototype
.
Init
=
function
(
ctrl
)
CMobileTouchManager
.
prototype
.
Init
=
function
(
ctrl
)
{
{
this
.
ctrl
=
ctrl
;
this
.
ctrl
=
ctrl
;
this
.
iScroll
=
new
window
.
CTouchScroll
(
ctrl
,{
hScrollbar
:
true
,
vScrollbar
:
true
,
momentum
:
false
}
/*, { onAnimationEnd : function(param) {
this
.
iScroll
=
new
AscCommonExcel
.
CTouchScroll
(
ctrl
,{
hScrollbar
:
true
,
vScrollbar
:
true
,
momentum
:
false
}
/*, { onAnimationEnd : function(param) {
param.api.MobileTouchManager.OnScrollAnimationEnd();
param.api.MobileTouchManager.OnScrollAnimationEnd();
} }*/
);
} }*/
);
};
};
...
...
common/Scrolls/iscroll.js
View file @
7d0c2891
...
@@ -1257,7 +1257,8 @@ function prefixStyle (style) {
...
@@ -1257,7 +1257,8 @@ function prefixStyle (style) {
dummyStyle
=
null
;
// for the sake of it
dummyStyle
=
null
;
// for the sake of it
window
.
CTouchScroll
=
CTouchScroll
;
//---------------------------------------------------------export---------------------------------------------------
window
.
CTouchScroll
;
window
[
'
AscCommon
'
]
=
window
[
'
AscCommon
'
]
||
{};
window
[
"
AscCommon
"
].
CTouchScroll
=
CTouchScroll
;
})(
window
,
document
);
})(
window
,
document
);
common/scroll.js
View file @
7d0c2891
...
@@ -24,6 +24,11 @@
...
@@ -24,6 +24,11 @@
*/
*/
"
use strict
"
;
"
use strict
"
;
(
/**
* @param {Window} window
* @param {undefined} undefined
*/
function
(
window
,
undefined
)
{
var
debug
=
false
;
var
debug
=
false
;
var
ScrollArrowType
=
{
var
ScrollArrowType
=
{
...
@@ -47,7 +52,7 @@ var ArrowStatus = {
...
@@ -47,7 +52,7 @@ var ArrowStatus = {
upLeftArrowNonActive_downRightArrowActive
:
3
,
upLeftArrowNonActive_downRightArrowActive
:
3
,
upLeftArrowNonActive_downRightArrowNonActive
:
4
,
upLeftArrowNonActive_downRightArrowNonActive
:
4
,
arrowHover
:
5
arrowHover
:
5
}
}
;
function
GetClientWidth
(
elem
)
{
function
GetClientWidth
(
elem
)
{
var
_w
=
elem
.
clientWidth
;
var
_w
=
elem
.
clientWidth
;
...
@@ -304,7 +309,7 @@ CArrowDrawer.prototype.InitSize = function ( sizeW, sizeH, is_retina ) {
...
@@ -304,7 +309,7 @@ CArrowDrawer.prototype.InitSize = function ( sizeW, sizeH, is_retina ) {
this
.
SizeW
>>=
1
;
this
.
SizeW
>>=
1
;
this
.
SizeH
>>=
1
;
this
.
SizeH
>>=
1
;
}
}
}
}
;
CArrowDrawer
.
prototype
.
drawArrow
=
function
(
type
,
mode
,
ctx
,
w
,
h
)
{
CArrowDrawer
.
prototype
.
drawArrow
=
function
(
type
,
mode
,
ctx
,
w
,
h
)
{
ctx
.
beginPath
();
ctx
.
beginPath
();
...
@@ -584,7 +589,7 @@ CArrowDrawer.prototype.drawArrow = function ( type, mode, ctx, w, h ) {
...
@@ -584,7 +589,7 @@ CArrowDrawer.prototype.drawArrow = function ( type, mode, ctx, w, h ) {
this
.
lastArrowStatus1
=
mode
;
this
.
lastArrowStatus1
=
mode
;
}
}
;
CArrowDrawer
.
prototype
.
drawTopLeftArrow
=
function
(
type
,
mode
,
ctx
,
w
,
h
){
CArrowDrawer
.
prototype
.
drawTopLeftArrow
=
function
(
type
,
mode
,
ctx
,
w
,
h
){
clearTimeout
(
this
.
fadeInTimeout1
);
clearTimeout
(
this
.
fadeInTimeout1
);
...
@@ -1012,7 +1017,7 @@ CArrowDrawer.prototype.drawTopLeftArrow = function(type,mode,ctx,w,h){
...
@@ -1012,7 +1017,7 @@ CArrowDrawer.prototype.drawTopLeftArrow = function(type,mode,ctx,w,h){
this
.
lastArrowStatus1
=
mode
;
this
.
lastArrowStatus1
=
mode
;
}
}
;
CArrowDrawer
.
prototype
.
drawBottomRightArrow
=
function
(
type
,
mode
,
ctx
,
w
,
h
){
CArrowDrawer
.
prototype
.
drawBottomRightArrow
=
function
(
type
,
mode
,
ctx
,
w
,
h
){
clearTimeout
(
this
.
fadeInTimeout2
);
clearTimeout
(
this
.
fadeInTimeout2
);
...
@@ -1449,7 +1454,7 @@ CArrowDrawer.prototype.drawBottomRightArrow = function(type,mode,ctx,w,h){
...
@@ -1449,7 +1454,7 @@ CArrowDrawer.prototype.drawBottomRightArrow = function(type,mode,ctx,w,h){
}
}
this
.
lastArrowStatus2
=
mode
;
this
.
lastArrowStatus2
=
mode
;
}
}
;
function
_HEXTORGB_
(
colorHEX
)
{
function
_HEXTORGB_
(
colorHEX
)
{
return
{
return
{
...
@@ -1487,7 +1492,7 @@ function ScrollObject( elemID, settings, dbg ) {
...
@@ -1487,7 +1492,7 @@ function ScrollObject( elemID, settings, dbg ) {
}
}
}
}
return
_st
;
return
_st
;
}
}
;
var
scrollSettings
=
{
var
scrollSettings
=
{
showArrows
:
false
,
showArrows
:
false
,
...
@@ -1605,8 +1610,8 @@ function ScrollObject( elemID, settings, dbg ) {
...
@@ -1605,8 +1610,8 @@ function ScrollObject( elemID, settings, dbg ) {
if
(
window
.
devicePixelRatio
==
2
)
if
(
window
.
devicePixelRatio
==
2
)
this
.
IsRetina
=
true
;
this
.
IsRetina
=
true
;
this
.
piperImgVert
=
[
document
.
createElement
(
'
canvas
'
),
document
.
createElement
(
'
canvas
'
)]
this
.
piperImgVert
=
[
document
.
createElement
(
'
canvas
'
),
document
.
createElement
(
'
canvas
'
)]
;
this
.
piperImgHor
=
[
document
.
createElement
(
'
canvas
'
),
document
.
createElement
(
'
canvas
'
)]
this
.
piperImgHor
=
[
document
.
createElement
(
'
canvas
'
),
document
.
createElement
(
'
canvas
'
)]
;
this
.
piperImgVert
[
0
].
height
=
13
;
this
.
piperImgVert
[
0
].
height
=
13
;
this
.
piperImgVert
[
1
].
height
=
13
;
this
.
piperImgVert
[
1
].
height
=
13
;
...
@@ -3337,3 +3342,8 @@ ScrollObject.prototype = {
...
@@ -3337,3 +3342,8 @@ ScrollObject.prototype = {
handle
(
that
);
handle
(
that
);
}
}
};
};
//---------------------------------------------------------export---------------------------------------------------
window
[
'
AscCommon
'
]
=
window
[
'
AscCommon
'
]
||
{};
window
[
"
AscCommon
"
].
ScrollObject
=
ScrollObject
;
})(
window
);
slide/Drawing/DrawingDocument.js
View file @
7d0c2891
...
@@ -4444,7 +4444,7 @@ function CThumbnailsManager()
...
@@ -4444,7 +4444,7 @@ function CThumbnailsManager()
}
}
else
else
{
{
word_control
.
m_oScrollThumb_
=
new
ScrollObject
(
"
id_vertical_scroll_thmbnl
"
,
settings
);
word_control
.
m_oScrollThumb_
=
new
AscCommon
.
ScrollObject
(
"
id_vertical_scroll_thmbnl
"
,
settings
);
word_control
.
m_oScrollThumb_
.
bind
(
"
scrollvertical
"
,
function
(
evt
){
word_control
.
m_oScrollThumb_
.
bind
(
"
scrollvertical
"
,
function
(
evt
){
oThis
.
verticalScroll
(
this
,
evt
.
scrollD
,
evt
.
maxScrollY
);
oThis
.
verticalScroll
(
this
,
evt
.
scrollD
,
evt
.
maxScrollY
);
});
});
...
...
slide/Drawing/HtmlPage.js
View file @
7d0c2891
...
@@ -2302,7 +2302,7 @@ function CEditorPage(api)
...
@@ -2302,7 +2302,7 @@ function CEditorPage(api)
if
(
this
.
m_oScrollHor_
)
if
(
this
.
m_oScrollHor_
)
this
.
m_oScrollHor_
.
Repos
(
settings
,
true
,
undefined
);
//unbind("scrollhorizontal")
this
.
m_oScrollHor_
.
Repos
(
settings
,
true
,
undefined
);
//unbind("scrollhorizontal")
else
{
else
{
this
.
m_oScrollHor_
=
new
ScrollObject
(
"
id_horizontal_scroll
"
,
settings
);
this
.
m_oScrollHor_
=
new
AscCommon
.
ScrollObject
(
"
id_horizontal_scroll
"
,
settings
);
this
.
m_oScrollHor_
.
bind
(
"
scrollhorizontal
"
,
function
(
evt
){
this
.
m_oScrollHor_
.
bind
(
"
scrollhorizontal
"
,
function
(
evt
){
oThis
.
horizontalScroll
(
this
,
evt
.
scrollD
,
evt
.
maxScrollX
);
oThis
.
horizontalScroll
(
this
,
evt
.
scrollD
,
evt
.
maxScrollX
);
});
});
...
@@ -2326,7 +2326,7 @@ function CEditorPage(api)
...
@@ -2326,7 +2326,7 @@ function CEditorPage(api)
else
else
{
{
this
.
m_oScrollVer_
=
new
ScrollObject
(
"
id_vertical_scroll
"
,
this
.
m_oScrollVer_
=
new
AscCommon
.
ScrollObject
(
"
id_vertical_scroll
"
,
settings
settings
);
);
...
@@ -2361,7 +2361,7 @@ function CEditorPage(api)
...
@@ -2361,7 +2361,7 @@ function CEditorPage(api)
}
}
else
else
{
{
this
.
m_oScrollNotes_
=
new
ScrollObject
(
"
id_vertical_scroll_notes
"
,
settings
);
this
.
m_oScrollNotes_
=
new
AscCommon
.
ScrollObject
(
"
id_vertical_scroll_notes
"
,
settings
);
this
.
m_oScrollNotes_
.
bind
(
"
scrollvertical
"
,
function
(
evt
){
this
.
m_oScrollNotes_
.
bind
(
"
scrollvertical
"
,
function
(
evt
){
});
});
this
.
m_oScrollNotesApi
=
this
.
m_oScrollNotes_
;
this
.
m_oScrollNotesApi
=
this
.
m_oScrollNotes_
;
...
...
word/Drawing/HtmlPage.js
View file @
7d0c2891
...
@@ -2795,7 +2795,7 @@ function CEditorPage(api)
...
@@ -2795,7 +2795,7 @@ function CEditorPage(api)
if
(
this
.
m_oScrollHor_
)
if
(
this
.
m_oScrollHor_
)
this
.
m_oScrollHor_
.
Repos
(
settings
,
this
.
m_bIsHorScrollVisible
);
this
.
m_oScrollHor_
.
Repos
(
settings
,
this
.
m_bIsHorScrollVisible
);
else
{
else
{
this
.
m_oScrollHor_
=
new
ScrollObject
(
"
id_horizontal_scroll
"
,
settings
);
this
.
m_oScrollHor_
=
new
AscCommon
.
ScrollObject
(
"
id_horizontal_scroll
"
,
settings
);
this
.
m_oScrollHor_
.
onLockMouse
=
function
(
evt
){
this
.
m_oScrollHor_
.
onLockMouse
=
function
(
evt
){
check_MouseDownEvent
(
evt
,
true
);
check_MouseDownEvent
(
evt
,
true
);
...
@@ -2814,7 +2814,7 @@ function CEditorPage(api)
...
@@ -2814,7 +2814,7 @@ function CEditorPage(api)
this
.
m_oScrollVer_
.
Repos
(
settings
,
undefined
,
true
);
this
.
m_oScrollVer_
.
Repos
(
settings
,
undefined
,
true
);
}
}
else
{
else
{
this
.
m_oScrollVer_
=
new
ScrollObject
(
"
id_vertical_scroll
"
,
settings
);
this
.
m_oScrollVer_
=
new
AscCommon
.
ScrollObject
(
"
id_vertical_scroll
"
,
settings
);
this
.
m_oScrollVer_
.
onLockMouse
=
function
(
evt
){
this
.
m_oScrollVer_
.
onLockMouse
=
function
(
evt
){
check_MouseDownEvent
(
evt
,
true
);
check_MouseDownEvent
(
evt
,
true
);
...
...
word/Drawing/WorkEvents.js
View file @
7d0c2891
...
@@ -780,7 +780,7 @@ function CMobileTouchManager()
...
@@ -780,7 +780,7 @@ function CMobileTouchManager()
this
.
LogicDocument
=
ctrl
.
m_oLogicDocument
;
this
.
LogicDocument
=
ctrl
.
m_oLogicDocument
;
this
.
DrawingDocument
=
ctrl
.
m_oDrawingDocument
;
this
.
DrawingDocument
=
ctrl
.
m_oDrawingDocument
;
this
.
iScroll
=
new
window
.
CTouchScroll
(
ctrl
,
{
onAnimationEnd
:
function
(
param
)
{
this
.
iScroll
=
new
AscCommon
.
CTouchScroll
(
ctrl
,
{
onAnimationEnd
:
function
(
param
)
{
param
.
api
.
MobileTouchManager
.
OnScrollAnimationEnd
();
param
.
api
.
MobileTouchManager
.
OnScrollAnimationEnd
();
}
});
}
});
...
@@ -2720,7 +2720,7 @@ function CReaderTouchManager()
...
@@ -2720,7 +2720,7 @@ function CReaderTouchManager()
this
.
LogicDocument
=
ctrl
.
m_oLogicDocument
;
this
.
LogicDocument
=
ctrl
.
m_oLogicDocument
;
this
.
DrawingDocument
=
ctrl
.
m_oDrawingDocument
;
this
.
DrawingDocument
=
ctrl
.
m_oDrawingDocument
;
this
.
iScroll
=
new
window
.
CTouchScroll
(
ctrl
,
{
bounce
:
true
},
this
.
HtmlPage
.
ReaderModeDiv
);
this
.
iScroll
=
new
AscCommon
.
CTouchScroll
(
ctrl
,
{
bounce
:
true
},
this
.
HtmlPage
.
ReaderModeDiv
);
this
.
HtmlPage
.
m_oApi
.
asc_fireCallback
(
"
asc_onHidePopMenu
"
);
this
.
HtmlPage
.
m_oApi
.
asc_fireCallback
(
"
asc_onHidePopMenu
"
);
}
}
...
...
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