From 3f6b9c943488d7dedc52182d88695365d84ce94b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Mon, 19 Aug 2013 14:16:22 +0200 Subject: [PATCH] Use ol.Collection#extend in examples This commit changes the examples to using ol.control.defaults().extend to extend the collection of controls. This is in preparation for a future commit that will remove the 2nd argument to ol.control.defaults. The same is done for ol.interaction.defaults. --- examples/custom-controls.js | 2 +- examples/drag-rotate-and-zoom.js | 2 +- examples/epsg-4326.js | 2 +- examples/full-screen-drag-rotate-and-zoom.js | 4 ++-- examples/full-screen.js | 2 +- examples/mouse-position.js | 2 +- examples/navigation-controls.js | 2 +- examples/scale-line.js | 2 +- examples/ten-thousand-points.js | 2 +- examples/wms-custom-proj.js | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/custom-controls.js b/examples/custom-controls.js index d5d774fbc7..3dec81a30b 100644 --- a/examples/custom-controls.js +++ b/examples/custom-controls.js @@ -64,7 +64,7 @@ ol.inherits(app.RotateNorthControl, ol.control.Control); var map = new ol.Map({ - controls: ol.control.defaults({}, [ + controls: ol.control.defaults().extend([ new app.RotateNorthControl() ]), layers: [ diff --git a/examples/drag-rotate-and-zoom.js b/examples/drag-rotate-and-zoom.js index 65a7b94768..6c594af871 100644 --- a/examples/drag-rotate-and-zoom.js +++ b/examples/drag-rotate-and-zoom.js @@ -8,7 +8,7 @@ goog.require('ol.source.MapQuestOpenAerial'); var map = new ol.Map({ - interactions: ol.interaction.defaults({}, [ + interactions: ol.interaction.defaults().extend([ new ol.interaction.DragRotateAndZoom() ]), layers: [ diff --git a/examples/epsg-4326.js b/examples/epsg-4326.js index e4e49eda8d..5de5b985f9 100644 --- a/examples/epsg-4326.js +++ b/examples/epsg-4326.js @@ -22,7 +22,7 @@ var layers = [ ]; var map = new ol.Map({ - controls: ol.control.defaults({}, [ + controls: ol.control.defaults().extend([ new ol.control.ScaleLine({ units: ol.control.ScaleLineUnits.DEGREES }) diff --git a/examples/full-screen-drag-rotate-and-zoom.js b/examples/full-screen-drag-rotate-and-zoom.js index 63c78ff58a..f40cd6a116 100644 --- a/examples/full-screen-drag-rotate-and-zoom.js +++ b/examples/full-screen-drag-rotate-and-zoom.js @@ -10,10 +10,10 @@ goog.require('ol.source.BingMaps'); var map = new ol.Map({ - controls: ol.control.defaults({}, [ + controls: ol.control.defaults().extend([ new ol.control.FullScreen() ]), - interactions: ol.interaction.defaults({}, [ + interactions: ol.interaction.defaults().extend([ new ol.interaction.DragRotateAndZoom() ]), layers: [ diff --git a/examples/full-screen.js b/examples/full-screen.js index 76eabda6d9..a500d21482 100644 --- a/examples/full-screen.js +++ b/examples/full-screen.js @@ -13,7 +13,7 @@ var view = new ol.View2D({ }); var map = new ol.Map({ - controls: ol.control.defaults({}, [ + controls: ol.control.defaults().extend([ new ol.control.FullScreen() ]), layers: [ diff --git a/examples/mouse-position.js b/examples/mouse-position.js index d6c262d1f2..3819b08807 100644 --- a/examples/mouse-position.js +++ b/examples/mouse-position.js @@ -20,7 +20,7 @@ var mousePositionControl = new ol.control.MousePosition({ }); var map = new ol.Map({ - controls: ol.control.defaults({}, [mousePositionControl]), + controls: ol.control.defaults().extend([mousePositionControl]), layers: [ new ol.layer.TileLayer({ source: new ol.source.OSM() diff --git a/examples/navigation-controls.js b/examples/navigation-controls.js index 86f6d06f1e..0c09d64507 100644 --- a/examples/navigation-controls.js +++ b/examples/navigation-controls.js @@ -8,7 +8,7 @@ goog.require('ol.source.OSM'); var map = new ol.Map({ - controls: ol.control.defaults({}, [ + controls: ol.control.defaults().extend([ new ol.control.ZoomToExtent({ extent: [ 813079.7791264898, diff --git a/examples/scale-line.js b/examples/scale-line.js index dffe53948d..4013f3e59a 100644 --- a/examples/scale-line.js +++ b/examples/scale-line.js @@ -11,7 +11,7 @@ goog.require('ol.source.OSM'); var scaleLineControl = new ol.control.ScaleLine(); var map = new ol.Map({ - controls: ol.control.defaults({}, [ + controls: ol.control.defaults().extend([ scaleLineControl ]), layers: [ diff --git a/examples/ten-thousand-points.js b/examples/ten-thousand-points.js index 87552e26e0..e2f1813fcd 100644 --- a/examples/ten-thousand-points.js +++ b/examples/ten-thousand-points.js @@ -42,7 +42,7 @@ var lineStringCollection = ol.geom2.LineStringCollection.pack([ ]); var map = new ol.Map({ - controls: ol.control.defaults({}, [ + controls: ol.control.defaults().extend([ new ol.control.MousePosition({ undefinedHTML: ' ' }) diff --git a/examples/wms-custom-proj.js b/examples/wms-custom-proj.js index 45c98dff45..2d71383205 100644 --- a/examples/wms-custom-proj.js +++ b/examples/wms-custom-proj.js @@ -47,7 +47,7 @@ var layers = [ ]; var map = new ol.Map({ - controls: ol.control.defaults({}, [ + controls: ol.control.defaults().extend([ new ol.control.ScaleLine({ units: ol.control.ScaleLineUnits.METRIC })