From 8b7a0a060ccde22add2f1f292f4ec628dc1fb9fe Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Wed, 4 Sep 2013 13:37:26 -0600 Subject: [PATCH] Export ol.interaction namespace instead of the defaults function --- examples/drag-rotate-and-zoom.js | 2 +- examples/full-screen-drag-rotate-and-zoom.js | 2 +- examples/select-features.js | 2 +- src/ol/interaction/interactiondefaults.js | 2 +- src/ol/map.js | 2 +- test/spec/ol/map.test.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/drag-rotate-and-zoom.js b/examples/drag-rotate-and-zoom.js index 6c594af871..bee87629eb 100644 --- a/examples/drag-rotate-and-zoom.js +++ b/examples/drag-rotate-and-zoom.js @@ -1,8 +1,8 @@ goog.require('ol.Map'); goog.require('ol.RendererHints'); goog.require('ol.View2D'); +goog.require('ol.interaction'); goog.require('ol.interaction.DragRotateAndZoom'); -goog.require('ol.interaction.defaults'); goog.require('ol.layer.TileLayer'); goog.require('ol.source.MapQuestOpenAerial'); diff --git a/examples/full-screen-drag-rotate-and-zoom.js b/examples/full-screen-drag-rotate-and-zoom.js index ddf40c116e..74fd946b5f 100644 --- a/examples/full-screen-drag-rotate-and-zoom.js +++ b/examples/full-screen-drag-rotate-and-zoom.js @@ -3,8 +3,8 @@ goog.require('ol.RendererHint'); goog.require('ol.View2D'); goog.require('ol.control'); goog.require('ol.control.FullScreen'); +goog.require('ol.interaction'); goog.require('ol.interaction.DragRotateAndZoom'); -goog.require('ol.interaction.defaults'); goog.require('ol.layer.TileLayer'); goog.require('ol.source.BingMaps'); diff --git a/examples/select-features.js b/examples/select-features.js index ab54750dbd..84d788986e 100644 --- a/examples/select-features.js +++ b/examples/select-features.js @@ -1,8 +1,8 @@ goog.require('ol.Map'); goog.require('ol.RendererHint'); goog.require('ol.View2D'); +goog.require('ol.interaction'); goog.require('ol.interaction.Select'); -goog.require('ol.interaction.defaults'); goog.require('ol.layer.TileLayer'); goog.require('ol.layer.Vector'); goog.require('ol.parser.ogc.GML_v3'); diff --git a/src/ol/interaction/interactiondefaults.js b/src/ol/interaction/interactiondefaults.js index 0fa4c3bc7f..ab0ecc0232 100644 --- a/src/ol/interaction/interactiondefaults.js +++ b/src/ol/interaction/interactiondefaults.js @@ -1,4 +1,4 @@ -goog.provide('ol.interaction.defaults'); +goog.provide('ol.interaction'); goog.require('ol.Collection'); goog.require('ol.Kinetic'); diff --git a/src/ol/map.js b/src/ol/map.js index d0d19c7cc2..f5f190f253 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -52,7 +52,7 @@ goog.require('ol.View2D'); goog.require('ol.ViewHint'); goog.require('ol.control'); goog.require('ol.extent'); -goog.require('ol.interaction.defaults'); +goog.require('ol.interaction'); goog.require('ol.layer.LayerBase'); goog.require('ol.layer.LayerGroup'); goog.require('ol.proj'); diff --git a/test/spec/ol/map.test.js b/test/spec/ol/map.test.js index e99d3ee857..d005b3e44b 100644 --- a/test/spec/ol/map.test.js +++ b/test/spec/ol/map.test.js @@ -127,6 +127,6 @@ goog.require('goog.dom'); goog.require('ol.Map'); goog.require('ol.RendererHint'); goog.require('ol.RendererHints'); +goog.require('ol.interaction'); goog.require('ol.interaction.DoubleClickZoom'); goog.require('ol.interaction.MouseWheelZoom'); -goog.require('ol.interaction.defaults');