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
d29c4b64
Commit
d29c4b64
authored
7 years ago
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mobile (web) bugs
parent
951a9cd3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
44 additions
and
1 deletion
+44
-1
common/Scrolls/mobileTouchManagerBase.js
common/Scrolls/mobileTouchManagerBase.js
+26
-1
slide/Drawing/HtmlPage.js
slide/Drawing/HtmlPage.js
+9
-0
word/Drawing/HtmlPage.js
word/Drawing/HtmlPage.js
+9
-0
No files found.
common/Scrolls/mobileTouchManagerBase.js
View file @
d29c4b64
...
...
@@ -618,6 +618,9 @@
this
.
pointerTouchesCoords
=
{};
this
.
IsZoomCheckFit
=
false
;
this
.
isShowingContextMenu
=
false
;
this
.
isMobileContextMenuShowResize
=
false
;
}
CMobileTouchManagerBase
.
prototype
.
initEvents
=
function
(
_id
)
...
...
@@ -768,6 +771,11 @@
var
_Transform
=
_table_outline_dr
.
TableMatrix
;
var
_PageNum
=
_table_outline_dr
.
CurrentPageIndex
;
var
_PageNumOrigin
=
_PageNum
;
if
(
_table_outline_dr
.
TableOutline
)
_PageNumOrigin
=
_table_outline_dr
.
TableOutline
.
PageNum
;
if
(
!
_Transform
||
global_MatrixTransformer
.
IsIdentity
(
_Transform
))
{
var
_x
=
global_mouseEvent
.
X
;
...
...
@@ -777,7 +785,7 @@
var
_offset
=
this
.
TableRulersRectSize
+
this
.
TableRulersRectOffset
;
if
(
_x
>
(
posLT
.
X
-
_offset
-
_eps
)
&&
_x
<
(
posLT
.
X
-
this
.
TableRulersRectOffset
+
_eps
)
&&
_y
>
(
posLT
.
Y
-
_offset
-
_eps
)
&&
_y
<
(
posLT
.
Y
-
this
.
TableRulersRectOffset
+
_eps
))
_y
>
(
posLT
.
Y
-
_offset
-
_eps
)
&&
_y
<
(
posLT
.
Y
-
this
.
TableRulersRectOffset
+
_eps
)
&&
(
_PageNumOrigin
==
_PageNum
)
)
{
this
.
Mode
=
AscCommon
.
MobileTouchMode
.
TableMove
;
bIsTable
=
true
;
...
...
@@ -1084,6 +1092,20 @@
var
_position
=
this
.
delegate
.
GetScrollPosition
();
this
.
iScroll
.
refresh
(
_position
);
}
if
(
this
.
isMobileContextMenuShowResize
)
this
.
SendShowContextMenu
();
};
CMobileTouchManagerBase
.
prototype
.
Resize_Before
=
function
()
{
this
.
isMobileContextMenuShowResize
=
this
.
isShowingContextMenu
;
};
CMobileTouchManagerBase
.
prototype
.
Resize_After
=
function
()
{
if
(
this
.
isMobileContextMenuShowResize
)
this
.
SendShowContextMenu
();
this
.
isMobileContextMenuShowResize
=
false
;
};
// есть ли тач или анимационный скролл/зум
...
...
@@ -1114,6 +1136,8 @@
if
(
-
1
!=
this
.
ContextMenuShowTimerId
)
clearTimeout
(
this
.
ContextMenuShowTimerId
);
this
.
isShowingContextMenu
=
true
;
var
that
=
this
;
this
.
ContextMenuShowTimerId
=
setTimeout
(
function
()
{
...
...
@@ -1373,6 +1397,7 @@
if
(
this
.
ContextMenuShowTimerId
!=
-
1
)
clearTimeout
(
this
.
ContextMenuShowTimerId
);
this
.
isShowingContextMenu
=
false
;
this
.
Api
.
sendEvent
(
"
asc_onHidePopMenu
"
);
};
...
...
This diff is collapsed.
Click to expand it.
slide/Drawing/HtmlPage.js
View file @
d29c4b64
...
...
@@ -945,6 +945,9 @@ function CEditorPage(api)
oWordControl
.
m_bIsRePaintOnScroll
=
true
;
oWordControl
.
OnScroll
();
if
(
this
.
MobileTouchManager
)
this
.
MobileTouchManager
.
Resize_After
();
};
this
.
zoom_Out
=
function
()
...
...
@@ -2438,6 +2441,9 @@ function CEditorPage(api)
return
;
}
if
(
this
.
MobileTouchManager
)
this
.
MobileTouchManager
.
Resize_Before
();
//console.log("resize");
this
.
CheckRetinaDisplay
();
this
.
m_oBody
.
Resize
(
this
.
Width
*
g_dKoef_pix_to_mm
,
this
.
Height
*
g_dKoef_pix_to_mm
,
this
);
...
...
@@ -2489,6 +2495,9 @@ function CEditorPage(api)
this
.
onTimerScroll_sync
(
true
);
this
.
DemonstrationManager
.
Resize
();
if
(
this
.
MobileTouchManager
)
this
.
MobileTouchManager
.
Resize_After
();
};
this
.
OnResize2
=
function
(
isAttack
)
...
...
This diff is collapsed.
Click to expand it.
word/Drawing/HtmlPage.js
View file @
d29c4b64
...
...
@@ -997,6 +997,9 @@ function CEditorPage(api)
oWordControl
.
OnScroll
();
if
(
this
.
MobileTouchManager
)
this
.
MobileTouchManager
.
Resize_After
();
};
this
.
zoom_Out
=
function
()
...
...
@@ -2648,6 +2651,9 @@ function CEditorPage(api)
if
(
!
isNewSize
&&
false
===
isAttack
)
return
;
if
(
this
.
MobileTouchManager
)
this
.
MobileTouchManager
.
Resize_Before
();
this
.
CheckRetinaDisplay
();
this
.
m_oBody
.
Resize
(
this
.
Width
*
g_dKoef_pix_to_mm
,
this
.
Height
*
g_dKoef_pix_to_mm
,
this
);
this
.
onButtonTabsDraw
();
...
...
@@ -2705,6 +2711,9 @@ function CEditorPage(api)
this
.
OnScroll
();
this
.
onTimerScroll2_sync
();
if
(
this
.
MobileTouchManager
)
this
.
MobileTouchManager
.
Resize_After
();
};
this
.
checkNeedRules
=
function
()
...
...
This diff is collapsed.
Click to expand it.
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