From 302f37ae7ac7e5afd3393355618e516e7f3d4406 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Wed, 7 Sep 2016 10:35:29 +0200 Subject: [PATCH] Rename ol.interaction.ExtentEventType to ol.interaction.Extent.EventType --- changelog/upgrade-notes.md | 1 + src/ol/interaction/extent.js | 29 ++++++++++++++--------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/changelog/upgrade-notes.md b/changelog/upgrade-notes.md index 0357b9a517..f026455b8a 100644 --- a/changelog/upgrade-notes.md +++ b/changelog/upgrade-notes.md @@ -18,6 +18,7 @@ A number of internal types have been renamed. This will not affect those who us * rename `ol.control.MousePositionProperty` to `ol.control.MousePosition.Property` * rename `ol.format.IGCZ` to `ol.format.IGC.Z` * rename `ol.interaction.ExtentEvent` to `ol.interaction.Extent.Event` + * rename `ol.interaction.ExtentEventType` to `ol.interaction.Extent.EventType` * rename `ol.interaction.DragAndDropEvent` to `ol.interaction.DragAndDrop.Event` * rename `ol.interaction.DragAndDropEventType` to `ol.interaction.DragAndDrop.EventType` * rename `ol.interaction.TranslateEvent` to `ol.interaction.Translate.Event` diff --git a/src/ol/interaction/extent.js b/src/ol/interaction/extent.js index c8aec8da7e..40b5b48b51 100644 --- a/src/ol/interaction/extent.js +++ b/src/ol/interaction/extent.js @@ -1,5 +1,4 @@ goog.provide('ol.interaction.Extent'); -goog.provide('ol.interaction.ExtentEventType'); goog.require('ol'); goog.require('ol.Feature'); @@ -17,19 +16,6 @@ goog.require('ol.source.Vector'); goog.require('ol.style.Style'); -/** - * @enum {string} - */ -ol.interaction.ExtentEventType = { - /** - * Triggered after the extent is changed - * @event ol.interaction.Extent.Event - * @api - */ - EXTENTCHANGED: 'extentchanged' -}; - - /** * @classdesc * Allows the user to draw a vector box by clicking and dragging on the map. @@ -465,7 +451,7 @@ ol.interaction.Extent.prototype.setExtent = function(extent) { * @extends {ol.events.Event} */ ol.interaction.Extent.Event = function(extent) { - ol.events.Event.call(this, ol.interaction.ExtentEventType.EXTENTCHANGED); + ol.events.Event.call(this, ol.interaction.Extent.EventType.EXTENTCHANGED); /** * The current extent. @@ -475,3 +461,16 @@ ol.interaction.Extent.Event = function(extent) { this.extent_ = extent; }; ol.inherits(ol.interaction.Extent.Event, ol.events.Event); + + +/** + * @enum {string} + */ +ol.interaction.Extent.EventType = { + /** + * Triggered after the extent is changed + * @event ol.interaction.Extent.Event + * @api + */ + EXTENTCHANGED: 'extentchanged' +};