ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename _ol_interaction_Property_ to InteractionProperty

Browse Source
This commit is contained in:
Frederic Junod
2018-01-11 14:01:51 +01:00
parent 7157de3851
commit f0d4fdd98e
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/interaction/Draw.js
View File

@@ -21,7 +21,7 @@ import Point from '../geom/Point.js';
import Polygon, {fromCircle, makeRegular} from '../geom/Polygon.js'; import Polygon, {fromCircle, makeRegular} from '../geom/Polygon.js';
import DrawEventType from '../interaction/DrawEventType.js'; import DrawEventType from '../interaction/DrawEventType.js';
import _ol_interaction_Pointer_ from '../interaction/Pointer.js'; import _ol_interaction_Pointer_ from '../interaction/Pointer.js';
import _ol_interaction_Property_ from '../interaction/Property.js'; import InteractionProperty from '../interaction/Property.js';
import VectorLayer from '../layer/Vector.js'; import VectorLayer from '../layer/Vector.js';
import VectorSource from '../source/Vector.js'; import VectorSource from '../source/Vector.js';
import _ol_style_Style_ from '../style/Style.js'; import _ol_style_Style_ from '../style/Style.js';
@@ -285,7 +285,7 @@ var Draw = function(options) {
} }
_ol_events_.listen(this, _ol_events_.listen(this,
BaseObject.getChangeEventType(_ol_interaction_Property_.ACTIVE), BaseObject.getChangeEventType(InteractionProperty.ACTIVE),
this.updateState_, this); this.updateState_, this);
}; };

8
src/ol/interaction/Interaction.js
View File

@@ -4,7 +4,7 @@
import {inherits} from '../index.js'; import {inherits} from '../index.js';
import BaseObject from '../Object.js'; import BaseObject from '../Object.js';
import {easeOut, linear} from '../easing.js'; import {easeOut, linear} from '../easing.js';
import _ol_interaction_Property_ from '../interaction/Property.js'; import InteractionProperty from '../interaction/Property.js';
import {clamp} from '../math.js'; import {clamp} from '../math.js';
@@ -67,9 +67,7 @@ inherits(Interaction, BaseObject);
* @api * @api
*/ */
Interaction.prototype.getActive = function() { Interaction.prototype.getActive = function() {
return ( return (/** @type {boolean} */ this.get(InteractionProperty.ACTIVE));
/** @type {boolean} */ this.get(_ol_interaction_Property_.ACTIVE)
);
}; };
@@ -90,7 +88,7 @@ Interaction.prototype.getMap = function() {
* @api * @api
*/ */
Interaction.prototype.setActive = function(active) { Interaction.prototype.setActive = function(active) {
this.set(_ol_interaction_Property_.ACTIVE, active); this.set(InteractionProperty.ACTIVE, active);
}; };

4
src/ol/interaction/Translate.js
View File

@@ -9,7 +9,7 @@ import Event from '../events/Event.js';
import {TRUE} from '../functions.js'; import {TRUE} from '../functions.js';
import {includes} from '../array.js'; import {includes} from '../array.js';
import _ol_interaction_Pointer_ from '../interaction/Pointer.js'; import _ol_interaction_Pointer_ from '../interaction/Pointer.js';
import _ol_interaction_Property_ from '../interaction/Property.js'; import InteractionProperty from '../interaction/Property.js';
import _ol_interaction_TranslateEventType_ from '../interaction/TranslateEventType.js'; import _ol_interaction_TranslateEventType_ from '../interaction/TranslateEventType.js';
/** /**
@@ -80,7 +80,7 @@ var _ol_interaction_Translate_ = function(opt_options) {
this.lastFeature_ = null; this.lastFeature_ = null;
_ol_events_.listen(this, _ol_events_.listen(this,
BaseObject.getChangeEventType(_ol_interaction_Property_.ACTIVE), BaseObject.getChangeEventType(InteractionProperty.ACTIVE),
this.handleActiveChanged_, this); this.handleActiveChanged_, this);
}; };