Fix map does not pan in Chrome 55 or Microsoft Edge

See openlayers#1510
marcobrt · Dec 16, 2016 · 5440711 · 5440711
1 parent e23dd90
commit 5440711
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/lib/OpenLayers/Events.js b/lib/OpenLayers/Events.js
@@ -673,12 +673,12 @@ OpenLayers.Events = OpenLayers.Class({
         for (var i = 0, len = this.BROWSER_EVENTS.length; i < len; i++) {
             type = this.BROWSER_EVENTS[i];
             // register the event cross-browser
-            OpenLayers.Event.observe(element, type, this.eventHandler
-            );
             if ((touchModel === this.TOUCH_MODEL_POINTER ||
                     touchModel === this.TOUCH_MODEL_MSPOINTER) &&
                     type.indexOf('touch') === 0) {
                 this.addPointerTouchListener(element, type, this.eventHandler);
+            } else {
+            	OpenLayers.Event.observe(element, type, this.eventHandler);
             }
         }
         // disable dragstart in IE so that mousedown/move/up works normally

diff --git a/theme/default/style.css b/theme/default/style.css
@@ -3,11 +3,12 @@ div.olMap {
     padding: 0 !important;
     margin: 0 !important;
     cursor: default;
+    -ms-touch-action: none;
+    touch-action: none;
 }
 
 div.olMapViewport {
     text-align: left;
-    -ms-touch-action: none;
 }
 
 div.olLayerDiv {

diff --git a/theme/default/style.mobile.css b/theme/default/style.mobile.css
@@ -43,9 +43,7 @@ div.olControlZoom a:hover {
         background: rgba(0, 60, 136, 0.5);
     }
 }
-div.olMapViewport {
-    -ms-touch-action: none;
-}
+
 .olLayerGrid .olTileImage {
     -webkit-transition: opacity 0.2s linear;
     -moz-transition: opacity 0.2s linear;