Skip to content

C
check
Commit 9c612b4a by Masaru Abe
Options

IE+タッチデバイスでタッチ操作が効かない問題対応

parent 2ae22361
Showing with 38 additions and 12 deletions
abvw/bookmark.html
......@@ -60,6 +60,13 @@
<script type="text/javascript" src="./common/js/scrolltopcontrol.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>
<body id="bookmark" oncontextmenu="return false;">
<header id="header-ws" class="header_ws">
......
abvw/contentsearch.html
......@@ -62,6 +62,13 @@
<script type="text/javascript" src="./common/js/scrolltopcontrol.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>
<body id="contentsearch" oncontextmenu="return false;">
......
abvw/history.html
......@@ -65,6 +65,13 @@
<script type="text/javascript" src="./js/detail.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>
<body id="history" oncontextmenu="return false;">
......
abvw/home.html
......@@ -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/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/screen.css?__UPDATEID__" />-->
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
......@@ -76,8 +75,12 @@
});
</script>
<style type="text/css">
</style>
<style>
html{
-ms-touch-action : none;
touch-action : none ;
}
</style>
</head>
......
abvw/js/contentview.js
......@@ -3651,7 +3651,11 @@ CONTENTVIEW.setDefaultEvent = function() {
}
if (CONTENTVIEW_GENERAL.avwUserEnvObj.browser == 'msie') {
CONTENTVIEW_GENERAL._bWin8TouchEnabled = window.navigator.msPointerEnabled;
//IEかつタッチ対応のデバイスか判定追加
if(navigator.msMaxTouchPoints && navigator.msMaxTouchPoints > 1) {
//console.log("navigator.msMaxTouchPoints:" + navigator.msMaxTouchPoints)
CONTENTVIEW_GENERAL._bWin8TouchEnabled = window.navigator.msPointerEnabled;
}
} else {
if( CONTENTVIEW_GENERAL._bTouchDeviceEnabled ){
document.getElementById('main').addEventListener('touchstart', CONTENTVIEW_EVENTS.onTouchstart, false);
......
abvw/js/contentview_Events.js
......@@ -1531,10 +1531,7 @@ CONTENTVIEW_EVENTS.onTouchstart = function(evt){
var bContinue = true;
//if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos() || CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
// evt.preventDefault();
//}
if( CONTENTVIEW_GENERAL._bTouchDeviceEnabled ){
if( CONTENTVIEW_GENERAL._bTouchDeviceEnabled || CONTENTVIEW_GENERAL._bWin8TouchEnabled){
evt.preventDefault();
evt.stopPropagation();
}
......@@ -1774,7 +1771,7 @@ CONTENTVIEW_EVENTS.onTouchmove = function(evt){
return;
}
if( CONTENTVIEW_GENERAL._bTouchDeviceEnabled ){
if(CONTENTVIEW_GENERAL._bTouchDeviceEnabled || CONTENTVIEW_GENERAL._bWin8TouchEnabled){
evt.preventDefault();
evt.stopPropagation();
}
......@@ -2065,7 +2062,7 @@ CONTENTVIEW_EVENTS.onTouchend = function(evt){
return;
}
if( CONTENTVIEW_GENERAL._bTouchDeviceEnabled ){
if(CONTENTVIEW_GENERAL._bTouchDeviceEnabled || CONTENTVIEW_GENERAL._bWin8TouchEnabled){
evt.preventDefault();
evt.stopPropagation();
}
......@@ -2275,8 +2272,9 @@ CONTENTVIEW_EVENTS.onTouchend = function(evt){
}
//CONTENTVIEW_STREAMING.debugLog("CONTENTVIEW_EVENTS.onTouchEnd");
CONTENTVIEW_STREAMING.handleDisplayToolbar();
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isMobile()) {
CONTENTVIEW.handleDisplayMobileToolbar();
}
}
}
}
......
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