From f0d4fdd98e1b67c6f38b0b83108fb2f030d762db Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Thu, 11 Jan 2018 14:01:51 +0100 Subject: [PATCH] Rename _ol_interaction_Property_ to InteractionProperty --- src/ol/interaction/Draw.js | 4 ++-- src/ol/interaction/Interaction.js | 8 +++----- src/ol/interaction/Translate.js | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/ol/interaction/Draw.js b/src/ol/interaction/Draw.js index 0c6913eefc..c6f739446f 100644 --- a/src/ol/interaction/Draw.js +++ b/src/ol/interaction/Draw.js @@ -21,7 +21,7 @@ import Point from '../geom/Point.js'; import Polygon, {fromCircle, makeRegular} from '../geom/Polygon.js'; import DrawEventType from '../interaction/DrawEventType.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 VectorSource from '../source/Vector.js'; import _ol_style_Style_ from '../style/Style.js'; @@ -285,7 +285,7 @@ var Draw = function(options) { } _ol_events_.listen(this, - BaseObject.getChangeEventType(_ol_interaction_Property_.ACTIVE), + BaseObject.getChangeEventType(InteractionProperty.ACTIVE), this.updateState_, this); }; diff --git a/src/ol/interaction/Interaction.js b/src/ol/interaction/Interaction.js index d11d310acd..be50c55879 100644 --- a/src/ol/interaction/Interaction.js +++ b/src/ol/interaction/Interaction.js @@ -4,7 +4,7 @@ import {inherits} from '../index.js'; import BaseObject from '../Object.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'; @@ -67,9 +67,7 @@ inherits(Interaction, BaseObject); * @api */ Interaction.prototype.getActive = function() { - return ( - /** @type {boolean} */ this.get(_ol_interaction_Property_.ACTIVE) - ); + return (/** @type {boolean} */ this.get(InteractionProperty.ACTIVE)); }; @@ -90,7 +88,7 @@ Interaction.prototype.getMap = function() { * @api */ Interaction.prototype.setActive = function(active) { - this.set(_ol_interaction_Property_.ACTIVE, active); + this.set(InteractionProperty.ACTIVE, active); }; diff --git a/src/ol/interaction/Translate.js b/src/ol/interaction/Translate.js index c603fc0e2a..146c256abc 100644 --- a/src/ol/interaction/Translate.js +++ b/src/ol/interaction/Translate.js @@ -9,7 +9,7 @@ import Event from '../events/Event.js'; import {TRUE} from '../functions.js'; import {includes} from '../array.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'; /** @@ -80,7 +80,7 @@ var _ol_interaction_Translate_ = function(opt_options) { this.lastFeature_ = null; _ol_events_.listen(this, - BaseObject.getChangeEventType(_ol_interaction_Property_.ACTIVE), + BaseObject.getChangeEventType(InteractionProperty.ACTIVE), this.handleActiveChanged_, this); };