Merge pull request #1931 from fredj/popup-scroll

Stop 'mouseweel' events in ol-overlaycontainer-stopevent div

src/ol/map.js

@@ -265,7 +265,8 @@ ol.Map = function(options) {
     goog.events.EventType.MOUSEDOWN,
     goog.events.EventType.TOUCHSTART,
     goog.events.EventType.MSPOINTERDOWN,
-    'pointerdown'
+    ol.MapBrowserEvent.EventType.POINTERDOWN,
+    goog.events.MouseWheelHandler.EventType.MOUSEWHEEL
   ], goog.events.Event.stopPropagation);
   goog.dom.appendChild(this.viewport_, this.overlayContainerStopEvent_);