Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_web
check
Commits
11df6324
Commit
11df6324
authored
Jun 27, 2014
by
Masaru Abe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#12490 PDFのみ3Dの反応が悪い
parent
0a4ad7f5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
16 deletions
+16
-16
abvw/js/contentview.js
+2
-1
abvw/js/contentview_Events.js
+13
-15
abvw/js/contentview_General.js
+1
-0
No files found.
abvw/js/contentview.js
View file @
11df6324
...
...
@@ -3674,6 +3674,7 @@ function removeObject() {
/* View Component setDefaultEvent */
function
setDefaultEvent
()
{
_bTouchDeviceEnabled
=
isTouchDevice
();
var
canvasPre
=
document
.
getElementById
(
'mainPre'
);
var
canvasNext
=
document
.
getElementById
(
'mainNext'
);
...
...
@@ -3703,7 +3704,7 @@ function setDefaultEvent() {
if
(
avwUserEnvObj
.
browser
==
'msie'
)
{
_bWin8TouchEnabled
=
window
.
navigator
.
msPointerEnabled
;
}
else
{
if
(
isTouchDevice
){
if
(
_bTouchDeviceEnabled
){
document
.
getElementById
(
'main'
).
addEventListener
(
'touchstart'
,
onTouchstart
,
false
);
document
.
getElementById
(
'main'
).
addEventListener
(
'touchmove'
,
onTouchmove
,
false
);
document
.
getElementById
(
'main'
).
addEventListener
(
'touchend'
,
onTouchend
,
false
);
...
...
abvw/js/contentview_Events.js
View file @
11df6324
...
...
@@ -1375,7 +1375,7 @@ function resetNaviAction(){
function
onTouchstart
(
evt
){
evt
.
preventDefault
();
//
evt.preventDefault();
if
(
ClientData
.
IsAddingMarking
()
==
true
){
return
;
...
...
@@ -1383,12 +1383,9 @@ function onTouchstart(evt){
var
bContinue
=
true
;
//if (avwUserEnvObj.os == "ipad" || avwUserEnvObj.os == "android") {
// evt.preventDefault();
//}
//if( isTouchDevice ){
// evt.preventDefault();
//}
if
(
_bTouchDeviceEnabled
){
evt
.
preventDefault
();
}
if
(
isLoadingObject
){
bContinue
=
false
;
...
...
@@ -1613,7 +1610,7 @@ var isPreventClick = false;
function
onTouchmove
(
evt
){
evt
.
preventDefault
();
//
evt.preventDefault();
if
(
ClientData
.
IsAddingMarking
()
==
true
){
return
;
...
...
@@ -1646,9 +1643,9 @@ function onTouchmove(evt){
return
;
}
//if (avwUserEnvObj.os == "ipad" || avwUserEnvObj.os == "android")
{
//
evt.preventDefault();
//
}
if
(
_bTouchDeviceEnabled
)
{
evt
.
preventDefault
();
}
var
touch1
=
null
;
var
touch2
=
null
;
...
...
@@ -1891,7 +1888,7 @@ function onTouchmove(evt){
function
onTouchend
(
evt
){
evt
.
preventDefault
();
//
evt.preventDefault();
if
(
ClientData
.
IsAddingMarking
()
==
true
){
return
;
...
...
@@ -1927,9 +1924,10 @@ function onTouchend(evt){
return
;
}
//if (avwUserEnvObj.os == "ipad" || avwUserEnvObj.os == "android") {
// evt.preventDefault();
//}
if
(
_bTouchDeviceEnabled
){
evt
.
preventDefault
();
}
_lastScaleDelta
=
userScale
-
1
;
if
(
_bWin8TouchEnabled
){
...
...
abvw/js/contentview_General.js
View file @
11df6324
...
...
@@ -174,6 +174,7 @@ var _lastScaleDelta = 0;
var
_bWin8TouchEnabled
=
false
;
var
_bTransitionEnable
=
true
;
var
_bTouchDeviceEnabled
=
false
;
//End Function : No.20
...
...
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