Rename ol.SelectEvent to ol.interaction.SelectEvent

This commit is contained in:
Frederic Junod
2015-08-24 11:35:37 +02:00
parent ffc24e892e
commit 9d07300e71

View File

@@ -1,5 +1,5 @@
goog.provide('ol.SelectEvent');
goog.provide('ol.interaction.Select'); goog.provide('ol.interaction.Select');
goog.provide('ol.interaction.SelectEvent');
goog.provide('ol.interaction.SelectFilterFunction'); goog.provide('ol.interaction.SelectFilterFunction');
goog.require('goog.array'); goog.require('goog.array');
@@ -22,7 +22,7 @@ goog.require('ol.source.Vector');
ol.SelectEventType = { ol.SelectEventType = {
/** /**
* Triggered when feature(s) has been (de)selected. * Triggered when feature(s) has been (de)selected.
* @event ol.SelectEvent#select * @event ol.interaction.SelectEvent#select
* @api * @api
*/ */
SELECT: 'select' SELECT: 'select'
@@ -53,7 +53,8 @@ ol.interaction.SelectFilterFunction;
* @extends {goog.events.Event} * @extends {goog.events.Event}
* @constructor * @constructor
*/ */
ol.SelectEvent = function(type, selected, deselected, mapBrowserEvent) { ol.interaction.SelectEvent =
function(type, selected, deselected, mapBrowserEvent) {
goog.base(this, type); goog.base(this, type);
/** /**
@@ -77,7 +78,7 @@ ol.SelectEvent = function(type, selected, deselected, mapBrowserEvent) {
*/ */
this.mapBrowserEvent = mapBrowserEvent; this.mapBrowserEvent = mapBrowserEvent;
}; };
goog.inherits(ol.SelectEvent, goog.events.Event); goog.inherits(ol.interaction.SelectEvent, goog.events.Event);
@@ -94,7 +95,7 @@ goog.inherits(ol.SelectEvent, goog.events.Event);
* @constructor * @constructor
* @extends {ol.interaction.Interaction} * @extends {ol.interaction.Interaction}
* @param {olx.interaction.SelectOptions=} opt_options Options. * @param {olx.interaction.SelectOptions=} opt_options Options.
* @fires ol.SelectEvent * @fires ol.interaction.SelectEvent
* @api stable * @api stable
*/ */
ol.interaction.Select = function(opt_options) { ol.interaction.Select = function(opt_options) {
@@ -285,8 +286,8 @@ ol.interaction.Select.handleEvent = function(mapBrowserEvent) {
} }
if (change) { if (change) {
this.dispatchEvent( this.dispatchEvent(
new ol.SelectEvent(ol.SelectEventType.SELECT, selected, deselected, new ol.interaction.SelectEvent(ol.SelectEventType.SELECT,
mapBrowserEvent)); selected, deselected, mapBrowserEvent));
} }
return ol.events.condition.pointerMove(mapBrowserEvent); return ol.events.condition.pointerMove(mapBrowserEvent);
}; };