#12490 PDFのみ3Dの反応が悪い

abvw/js/contentview.js

@@ -3659,7 +3659,7 @@ function removeObject() {
 /* View Component setDefaultEvent */
 /* View Component setDefaultEvent */
 function setDefaultEvent() {
 function setDefaultEvent() {
     
     
-    //alert("setDefaultEvent");
+    _bTouchDeviceEnabled = isTouchDevice();
     
     
     var canvasPre = document.getElementById('mainPre');
     var canvasPre = document.getElementById('mainPre');
     var canvasNext = document.getElementById('mainNext');
     var canvasNext = document.getElementById('mainNext');
@@ -3681,6 +3681,7 @@ function setDefaultEvent() {
     document.getElementById('divCheckExistMarking').addEventListener('click', onClick_CanvasMain, false);
     document.getElementById('divCheckExistMarking').addEventListener('click', onClick_CanvasMain, false);
        
        
     if(avwUserEnvObj.os != "ipad" && avwUserEnvObj.os != "android"){
     if(avwUserEnvObj.os != "ipad" && avwUserEnvObj.os != "android"){
+    
         document.getElementById('main').addEventListener('mousedown', mouseDown_CanvasMain, false);
         document.getElementById('main').addEventListener('mousedown', mouseDown_CanvasMain, false);
         document.getElementById('main').addEventListener('mousemove', mouseMove_canvasMain, false);
         document.getElementById('main').addEventListener('mousemove', mouseMove_canvasMain, false);
         document.getElementById('main').addEventListener('mouseup', mouseUp_CanvasMain, false); 
         document.getElementById('main').addEventListener('mouseup', mouseUp_CanvasMain, false); 
@@ -3688,7 +3689,7 @@ function setDefaultEvent() {
         if (avwUserEnvObj.browser == 'msie') {
         if (avwUserEnvObj.browser == 'msie') {
             _bWin8TouchEnabled = window.navigator.msPointerEnabled;
             _bWin8TouchEnabled = window.navigator.msPointerEnabled;
         } else {
         } else {
-            if( isTouchDevice ){
+            if( _bTouchDeviceEnabled ){
                 document.getElementById('main').addEventListener('touchstart', onTouchstart, false);
                 document.getElementById('main').addEventListener('touchstart', onTouchstart, false);
                 document.getElementById('main').addEventListener('touchmove', onTouchmove, false);
                 document.getElementById('main').addEventListener('touchmove', onTouchmove, false);
                 document.getElementById('main').addEventListener('touchend', onTouchend, false);
                 document.getElementById('main').addEventListener('touchend', onTouchend, false);

abvw/js/contentview_Events.js

@@ -1218,7 +1218,6 @@ function mouseDown_CanvasMain(event) {
 };
 };
 
 
 function mouseUp_CanvasMain(event) {
 function mouseUp_CanvasMain(event) {
-    //Start Function : No.20
 
 
     event.preventDefault();
     event.preventDefault();
     
     
@@ -1368,7 +1367,7 @@ function resetNaviAction(){
 
 
 function onTouchstart(evt){
 function onTouchstart(evt){
 
 
-    evt.preventDefault();
+    //evt.preventDefault();
 
 
     if(ClientData.IsAddingMarking() == true){
     if(ClientData.IsAddingMarking() == true){
         return;  
         return;  
@@ -1379,9 +1378,9 @@ function onTouchstart(evt){
     //if (avwUserEnvObj.os == "ipad" || avwUserEnvObj.os == "android") {
     //if (avwUserEnvObj.os == "ipad" || avwUserEnvObj.os == "android") {
     //    evt.preventDefault();
     //    evt.preventDefault();
     //}
     //}
-    //if( isTouchDevice ){
-    //    evt.preventDefault();
-    //}
+    if( _bTouchDeviceEnabled ){
+        evt.preventDefault();
+    }
     
     
     if(isLoadingObject){
     if(isLoadingObject){
         bContinue = false;
         bContinue = false;
@@ -1606,7 +1605,7 @@ var isPreventClick = false;
 
 
 function onTouchmove(evt){
 function onTouchmove(evt){
 
 
-    evt.preventDefault();
+    //evt.preventDefault();
 
 
     if(ClientData.IsAddingMarking() == true){
     if(ClientData.IsAddingMarking() == true){
         return;  
         return;  
@@ -1642,6 +1641,9 @@ function onTouchmove(evt){
     //if (avwUserEnvObj.os == "ipad" || avwUserEnvObj.os == "android") {
     //if (avwUserEnvObj.os == "ipad" || avwUserEnvObj.os == "android") {
     //    evt.preventDefault();
     //    evt.preventDefault();
     //}
     //}
+    if( _bTouchDeviceEnabled ){
+        evt.preventDefault();
+    }
     
     
     var touch1 = null;
     var touch1 = null;
     var touch2 = null;      
     var touch2 = null;      
@@ -1884,7 +1886,9 @@ function onTouchmove(evt){
 
 
 function onTouchend(evt){
 function onTouchend(evt){
     
     
+    if( _bTouchDeviceEnabled ){
         evt.preventDefault();
         evt.preventDefault();
+    }
     
     
     if(ClientData.IsAddingMarking() == true){
     if(ClientData.IsAddingMarking() == true){
         return;  
         return;  

abvw/js/contentview_General.js

@@ -174,6 +174,8 @@ var _lastScaleDelta = 0;
 
 
 var _bWin8TouchEnabled = false;
 var _bWin8TouchEnabled = false;
 var _bTransitionEnable = true;
 var _bTransitionEnable = true;
+var _bTouchDeviceEnabled = false;
+
 //End Function : No.20
 //End Function : No.20