diff --git a/src/ol.js b/src/ol.js index a633183537..e2f45dd3d2 100644 --- a/src/ol.js +++ b/src/ol.js @@ -3,7 +3,6 @@ goog.require('ol.bounds'); goog.require('ol.control.Control'); goog.require('ol.control.Navigation'); goog.require('ol.event'); -goog.require('ol.event.Drag'); goog.require('ol.event.Events'); goog.require('ol.event.Sequence'); goog.require("ol.map"); diff --git a/src/ol/Map.js b/src/ol/Map.js index a88bbf9f53..0723ed1903 100644 --- a/src/ol/Map.js +++ b/src/ol/Map.js @@ -4,7 +4,6 @@ goog.require('ol.Loc'); goog.require('ol.Projection'); goog.require('ol.event'); goog.require('ol.event.Events'); -goog.require('ol.event.Drag'); goog.require('ol.control.Control'); @@ -79,9 +78,7 @@ ol.Map = function() { * @private * @type {ol.event.Events} */ - this.events_ = new ol.event.Events( - this, undefined, true, [new ol.event.Drag()] - ); + this.events_ = new ol.event.Events(this); /** * @private @@ -89,6 +86,8 @@ ol.Map = function() { */ this.container_ = null; + this.setControls(ol.Map.DEFAULT_CONTROLS); + }; /** @@ -115,7 +114,7 @@ ol.Map.DEFAULT_TILE_SIZE = 256; @const @type {Array.} */ -ol.Map.DEFAULT_CONTROLS = ["Navigation", "Zoom"]; +ol.Map.DEFAULT_CONTROLS = ["Navigation"]; /** * @return {ol.Loc} Location. diff --git a/src/ol/event/Events.js b/src/ol/event/Events.js index 2b699ae06f..c31f8f8fd9 100644 --- a/src/ol/event/Events.js +++ b/src/ol/event/Events.js @@ -6,7 +6,7 @@ goog.require('goog.events.EventType'); goog.require('goog.events.EventTarget'); goog.require('goog.events.Listener'); goog.require('goog.style'); - +goog.require('goog.fx.Dragger'); /** * Determine whether event was caused by a single touch diff --git a/test/spec/ol/Events.test.js b/test/spec/ol/Events.test.js index 2353bd0e3c..26fa7be2c9 100644 --- a/test/spec/ol/Events.test.js +++ b/test/spec/ol/Events.test.js @@ -125,9 +125,7 @@ describe("ol.event.Events", function() { it("can map browser events to sequences", function() { var element = document.createElement("div"), - events = new ol.event.Events( - "foo", element, false, [new ol.event.Drag()] - ), + events = new ol.event.Events("foo", element), mockEvt; // mock dom object