Skip to content

C
check
Commit 78737fea by Masaru Abe
Options

#15710 【シンカーミクセル】Windows8+IE11+タッチパネルの組み合わせでWeb版のViewerでスクロールが出来なくなる。

parent 3d865cde
Showing with 36 additions and 6 deletions
abvw/bookmark.html
...@@ -59,6 +59,13 @@ ...@@ -59,6 +59,13 @@
<script type="text/javascript" src="./common/js/thickbox.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/thickbox.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/scrolltopcontrol.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
...@@ -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="./common/js/scrolltopcontrol.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/scrolltopcontrol.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;">
<header id="header-ws" class="header_ws"> <header id="header-ws" class="header_ws">
......
abvw/history.html
...@@ -68,6 +68,13 @@ ...@@ -68,6 +68,13 @@
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script> <script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script> <script type="text/javascript" src="./js/detail.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
...@@ -72,6 +72,13 @@ ...@@ -72,6 +72,13 @@
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script> <script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script> <script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script>
<style>
html{
-ms-touch-action : none;
touch-action : none ;
}
</style>
</head> </head>
<body id="bookshelf" oncontextmenu="return false;"> <body id="bookshelf" oncontextmenu="return false;">
......
abvw/js/contentview.js
...@@ -3499,7 +3499,11 @@ CONTENTVIEW.setDefaultEvent = function() { ...@@ -3499,7 +3499,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
...@@ -1412,10 +1412,7 @@ CONTENTVIEW_EVENTS.onTouchstart = function(evt){ ...@@ -1412,10 +1412,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();
} }
...@@ -1425,6 +1422,7 @@ CONTENTVIEW_EVENTS.onTouchstart = function(evt){ ...@@ -1425,6 +1422,7 @@ CONTENTVIEW_EVENTS.onTouchstart = function(evt){
} }
if( evt.pointerType != null ){ if( evt.pointerType != null ){
//console.log("evt.pointerType:" + evt.pointerType);
//evt.pointerType は IE以外 undef //evt.pointerType は IE以外 undef
switch (evt.pointerType) { switch (evt.pointerType) {
case evt.MSPOINTER_TYPE_TOUCH: case evt.MSPOINTER_TYPE_TOUCH:
...@@ -1655,7 +1653,7 @@ CONTENTVIEW_EVENTS.onTouchmove = function(evt){ ...@@ -1655,7 +1653,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();
} }
...@@ -1946,7 +1944,7 @@ CONTENTVIEW_EVENTS.onTouchend = function(evt){ ...@@ -1946,7 +1944,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();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment