Merge remote-tracking branch 'openlayers/master' into vector-api

2013-11-27 13:10:20 +01:00
parent 2f3a85a86a 8a15c33b86
commit 424f8fcc6d
55 changed files with 2496 additions and 200 deletions
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -245,11 +245,8 @@ ol.Map = function(options) {
    goog.events.EventType.CLICK,
    goog.events.EventType.DBLCLICK,
    goog.events.EventType.MOUSEDOWN,
-    goog.events.EventType.MOUSEUP,
    goog.events.EventType.TOUCHSTART,
-    goog.events.EventType.TOUCHEND,
-    goog.events.EventType.MSPOINTERDOWN,
-    goog.events.EventType.MSPOINTERUP
+    goog.events.EventType.MSPOINTERDOWN
  ], goog.events.Event.stopPropagation);
  goog.dom.appendChild(this.viewport_, this.overlayContainerStopEvent_);