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
9c612b4a
Commit
9c612b4a
authored
Mar 31, 2015
by
Masaru Abe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
IE+タッチデバイスでタッチ操作が効かない問題対応
parent
2ae22361
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
37 additions
and
11 deletions
+37
-11
abvw/bookmark.html
+7
-0
abvw/contentsearch.html
+7
-0
abvw/history.html
+7
-0
abvw/home.html
+6
-3
abvw/js/contentview.js
+4
-0
abvw/js/contentview_Events.js
+6
-8
No files found.
abvw/bookmark.html
View file @
9c612b4a
...
@@ -60,6 +60,13 @@
...
@@ -60,6 +60,13 @@
<script
type=
"text/javascript"
src=
"./common/js/scrolltopcontrol.js?__UPDATEID__"
></script>
<script
type=
"text/javascript"
src=
"./common/js/scrolltopcontrol.js?__UPDATEID__"
></script>
<script
type=
"text/javascript"
src=
"./js/contentview_FileSystem.js?__UPDATEID__"
></script>
<script
type=
"text/javascript"
src=
"./js/contentview_FileSystem.js?__UPDATEID__"
></script>
<style>
html
{
-ms-touch-action
:
none
;
touch-action
:
none
;
}
</style>
</head>
</head>
<body
id=
"bookmark"
oncontextmenu=
"return false;"
>
<body
id=
"bookmark"
oncontextmenu=
"return false;"
>
<header
id=
"header-ws"
class=
"header_ws"
>
<header
id=
"header-ws"
class=
"header_ws"
>
...
...
abvw/contentsearch.html
View file @
9c612b4a
...
@@ -62,6 +62,13 @@
...
@@ -62,6 +62,13 @@
<script
type=
"text/javascript"
src=
"./common/js/scrolltopcontrol.js?__UPDATEID__"
></script>
<script
type=
"text/javascript"
src=
"./common/js/scrolltopcontrol.js?__UPDATEID__"
></script>
<script
type=
"text/javascript"
src=
"./js/contentview_FileSystem.js?__UPDATEID__"
></script>
<script
type=
"text/javascript"
src=
"./js/contentview_FileSystem.js?__UPDATEID__"
></script>
<style>
html
{
-ms-touch-action
:
none
;
touch-action
:
none
;
}
</style>
</head>
</head>
<body
id=
"contentsearch"
oncontextmenu=
"return false;"
>
<body
id=
"contentsearch"
oncontextmenu=
"return false;"
>
...
...
abvw/history.html
View file @
9c612b4a
...
@@ -65,6 +65,13 @@
...
@@ -65,6 +65,13 @@
<script
type=
"text/javascript"
src=
"./js/detail.js?__UPDATEID__"
></script>
<script
type=
"text/javascript"
src=
"./js/detail.js?__UPDATEID__"
></script>
<script
type=
"text/javascript"
src=
"./js/contentview_FileSystem.js?__UPDATEID__"
></script>
<script
type=
"text/javascript"
src=
"./js/contentview_FileSystem.js?__UPDATEID__"
></script>
<style>
html
{
-ms-touch-action
:
none
;
touch-action
:
none
;
}
</style>
</head>
</head>
<body
id=
"history"
oncontextmenu=
"return false;"
>
<body
id=
"history"
oncontextmenu=
"return false;"
>
...
...
abvw/home.html
View file @
9c612b4a
...
@@ -15,7 +15,6 @@
...
@@ -15,7 +15,6 @@
<link
rel=
"stylesheet"
type=
"text/css"
href=
"common/css/default.css?__UPDATEID__"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"common/css/default.css?__UPDATEID__"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"common/css/screenLock.css?__UPDATEID__"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"common/css/screenLock.css?__UPDATEID__"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"common/css/jquery.treeview.css?__UPDATEID__"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"common/css/jquery.treeview.css?__UPDATEID__"
/>
<!--<link rel="stylesheet" type="text/css" href="common/css/screen.css?__UPDATEID__" />-->
<link
rel=
"stylesheet"
type=
"text/css"
href=
"css/reset.css?__UPDATEID__"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"css/reset.css?__UPDATEID__"
/>
...
@@ -76,8 +75,12 @@
...
@@ -76,8 +75,12 @@
});
});
</script>
</script>
<style
type=
"text/css"
>
<style>
</style>
html
{
-ms-touch-action
:
none
;
touch-action
:
none
;
}
</style>
</head>
</head>
...
...
abvw/js/contentview.js
View file @
9c612b4a
...
@@ -3651,7 +3651,11 @@ CONTENTVIEW.setDefaultEvent = function() {
...
@@ -3651,7 +3651,11 @@ CONTENTVIEW.setDefaultEvent = function() {
}
}
if
(
CONTENTVIEW_GENERAL
.
avwUserEnvObj
.
browser
==
'msie'
)
{
if
(
CONTENTVIEW_GENERAL
.
avwUserEnvObj
.
browser
==
'msie'
)
{
//IEかつタッチ対応のデバイスか判定追加
if
(
navigator
.
msMaxTouchPoints
&&
navigator
.
msMaxTouchPoints
>
1
)
{
//console.log("navigator.msMaxTouchPoints:" + navigator.msMaxTouchPoints)
CONTENTVIEW_GENERAL
.
_bWin8TouchEnabled
=
window
.
navigator
.
msPointerEnabled
;
CONTENTVIEW_GENERAL
.
_bWin8TouchEnabled
=
window
.
navigator
.
msPointerEnabled
;
}
}
else
{
}
else
{
if
(
CONTENTVIEW_GENERAL
.
_bTouchDeviceEnabled
){
if
(
CONTENTVIEW_GENERAL
.
_bTouchDeviceEnabled
){
document
.
getElementById
(
'main'
).
addEventListener
(
'touchstart'
,
CONTENTVIEW_EVENTS
.
onTouchstart
,
false
);
document
.
getElementById
(
'main'
).
addEventListener
(
'touchstart'
,
CONTENTVIEW_EVENTS
.
onTouchstart
,
false
);
...
...
abvw/js/contentview_Events.js
View file @
9c612b4a
...
@@ -1531,10 +1531,7 @@ CONTENTVIEW_EVENTS.onTouchstart = function(evt){
...
@@ -1531,10 +1531,7 @@ CONTENTVIEW_EVENTS.onTouchstart = function(evt){
var
bContinue
=
true
;
var
bContinue
=
true
;
//if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos() || CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
if
(
CONTENTVIEW_GENERAL
.
_bTouchDeviceEnabled
||
CONTENTVIEW_GENERAL
.
_bWin8TouchEnabled
){
// evt.preventDefault();
//}
if
(
CONTENTVIEW_GENERAL
.
_bTouchDeviceEnabled
){
evt
.
preventDefault
();
evt
.
preventDefault
();
evt
.
stopPropagation
();
evt
.
stopPropagation
();
}
}
...
@@ -1774,7 +1771,7 @@ CONTENTVIEW_EVENTS.onTouchmove = function(evt){
...
@@ -1774,7 +1771,7 @@ CONTENTVIEW_EVENTS.onTouchmove = function(evt){
return
;
return
;
}
}
if
(
CONTENTVIEW_GENERAL
.
_bTouchDeviceEnabled
){
if
(
CONTENTVIEW_GENERAL
.
_bTouchDeviceEnabled
||
CONTENTVIEW_GENERAL
.
_bWin8TouchEnabled
){
evt
.
preventDefault
();
evt
.
preventDefault
();
evt
.
stopPropagation
();
evt
.
stopPropagation
();
}
}
...
@@ -2065,7 +2062,7 @@ CONTENTVIEW_EVENTS.onTouchend = function(evt){
...
@@ -2065,7 +2062,7 @@ CONTENTVIEW_EVENTS.onTouchend = function(evt){
return
;
return
;
}
}
if
(
CONTENTVIEW_GENERAL
.
_bTouchDeviceEnabled
){
if
(
CONTENTVIEW_GENERAL
.
_bTouchDeviceEnabled
||
CONTENTVIEW_GENERAL
.
_bWin8TouchEnabled
){
evt
.
preventDefault
();
evt
.
preventDefault
();
evt
.
stopPropagation
();
evt
.
stopPropagation
();
}
}
...
@@ -2275,8 +2272,9 @@ CONTENTVIEW_EVENTS.onTouchend = function(evt){
...
@@ -2275,8 +2272,9 @@ CONTENTVIEW_EVENTS.onTouchend = function(evt){
}
}
//CONTENTVIEW_STREAMING.debugLog("CONTENTVIEW_EVENTS.onTouchEnd");
//CONTENTVIEW_STREAMING.debugLog("CONTENTVIEW_EVENTS.onTouchEnd");
CONTENTVIEW_STREAMING
.
handleDisplayToolbar
();
if
(
CONTENTVIEW_GENERAL
.
avwUserEnvObj
.
isMobile
())
{
CONTENTVIEW
.
handleDisplayMobileToolbar
();
}
}
}
}
}
}
}
...
...
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