Remove property enum from interaction constructor

This commit is contained in:
Tim Schaub
2016-12-27 09:07:58 -07:00
parent 63a8a5a2cc
commit 50b9e598f6
3 changed files with 17 additions and 16 deletions

View File

@@ -1,15 +1,15 @@
goog.provide('ol.interaction.Draw');
goog.require('ol');
goog.require('ol.events');
goog.require('ol.extent');
goog.require('ol.events.Event');
goog.require('ol.Feature');
goog.require('ol.MapBrowserEvent');
goog.require('ol.Object');
goog.require('ol.coordinate');
goog.require('ol.functions');
goog.require('ol.events');
goog.require('ol.events.Event');
goog.require('ol.events.condition');
goog.require('ol.extent');
goog.require('ol.functions');
goog.require('ol.geom.Circle');
goog.require('ol.geom.GeometryType');
goog.require('ol.geom.LineString');
@@ -18,8 +18,8 @@ goog.require('ol.geom.MultiPoint');
goog.require('ol.geom.MultiPolygon');
goog.require('ol.geom.Point');
goog.require('ol.geom.Polygon');
goog.require('ol.interaction.Interaction');
goog.require('ol.interaction.Pointer');
goog.require('ol.interaction.Property');
goog.require('ol.layer.Vector');
goog.require('ol.source.Vector');
goog.require('ol.style.Style');
@@ -265,7 +265,7 @@ ol.interaction.Draw = function(options) {
}
ol.events.listen(this,
ol.Object.getChangeEventType(ol.interaction.Interaction.Property.ACTIVE),
ol.Object.getChangeEventType(ol.interaction.Property.ACTIVE),
this.updateState_, this);
};

View File

@@ -5,6 +5,7 @@ goog.provide('ol.interaction.Interaction');
goog.require('ol');
goog.require('ol.Object');
goog.require('ol.easing');
goog.require('ol.interaction.Property');
/**
@@ -53,7 +54,7 @@ ol.inherits(ol.interaction.Interaction, ol.Object);
*/
ol.interaction.Interaction.prototype.getActive = function() {
return /** @type {boolean} */ (
this.get(ol.interaction.Interaction.Property.ACTIVE));
this.get(ol.interaction.Property.ACTIVE));
};
@@ -74,7 +75,7 @@ ol.interaction.Interaction.prototype.getMap = function() {
* @api
*/
ol.interaction.Interaction.prototype.setActive = function(active) {
this.set(ol.interaction.Interaction.Property.ACTIVE, active);
this.set(ol.interaction.Property.ACTIVE, active);
};
@@ -217,11 +218,3 @@ ol.interaction.Interaction.zoomWithoutConstraints = function(map, view, resoluti
}
}
};
/**
* @enum {string}
*/
ol.interaction.Interaction.Property = {
ACTIVE: 'active'
};

View File

@@ -0,0 +1,8 @@
goog.provide('ol.interaction.Property');
/**
* @enum {string}
*/
ol.interaction.Property = {
ACTIVE: 'active'
};