Merge branch 'master' of http://129.211.99.254:8088/shiyunjie/pdf-html

iframe/web/viewer.html

@@ -148,12 +148,12 @@ See https://github.com/adobe-type-tools/cmap-resources
 			document.addEventListener("touchmove", (e) => {
 
 				if (e.scale !== 1 && isiOSXZ ) {
-					e.preventDefault();
+					//e.preventDefault();
 					}
 				}, { passive: false });
 
 			viewer.addEventListener("touchstart", (e) => {
-				e.preventDefault();
+				//e.preventDefault();
 				if (e.touches.length > 1) {
 					startX = (e.touches[0].pageX + e.touches[1].pageX) / 2;
 					startY = (e.touches[0].pageY + e.touches[1].pageY) / 2;
@@ -161,7 +161,10 @@ See https://github.com/adobe-type-tools/cmap-resources
 				} else {
 					initialPinchDistance = 0;
 				}
-			});
+					let load = document.getElementById('loading');
+					load.style.width = 0;
+					load.innerHTML = ''
+			},false);
 
 			viewer.addEventListener("touchmove", (e) => {
 				console.log('viewer_touchmove')
@@ -176,7 +179,7 @@ See https://github.com/adobe-type-tools/cmap-resources
 
 				viewer.style.transform = `scale(${pinchScale})`;
 				viewer.style.transformOrigin = `${originX}px ${originY}px`;
-			});
+			},false);
 
 			viewer.addEventListener("touchend", (e) => {
 				if (initialPinchDistance <= 0) { return; }
@@ -192,7 +195,7 @@ See https://github.com/adobe-type-tools/cmap-resources
 				container.scrollTop += dy * (pinchScale - 1);
 
 				reset();
-			});
+			},false);
 		}