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

Rename _ol_ObjectEventType_ to ObjectEventType

Browse Source
This commit is contained in:
Frederic Junod
2017-12-18 12:33:21 +01:00
parent 7fd957c2e5
commit e23d0bf907
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/Object.js
View File

@@ -2,7 +2,7 @@
* @module ol/Object * @module ol/Object
*/ */
import {getUid, inherits} from './index.js'; import {getUid, inherits} from './index.js';
import _ol_ObjectEventType_ from './ObjectEventType.js'; import ObjectEventType from './ObjectEventType.js';
import _ol_Observable_ from './Observable.js'; import _ol_Observable_ from './Observable.js';
import Event from './events/Event.js'; import Event from './events/Event.js';
import _ol_obj_ from './obj.js'; import _ol_obj_ from './obj.js';
@@ -136,7 +136,7 @@ _ol_Object_.prototype.notify = function(key, oldValue) {
var eventType; var eventType;
eventType = _ol_Object_.getChangeEventType(key); eventType = _ol_Object_.getChangeEventType(key);
this.dispatchEvent(new _ol_Object_.Event(eventType, key, oldValue)); this.dispatchEvent(new _ol_Object_.Event(eventType, key, oldValue));
eventType = _ol_ObjectEventType_.PROPERTYCHANGE; eventType = ObjectEventType.PROPERTYCHANGE;
this.dispatchEvent(new _ol_Object_.Event(eventType, key, oldValue)); this.dispatchEvent(new _ol_Object_.Event(eventType, key, oldValue));
}; };

6
src/ol/PluggableMap.js
View File

@@ -11,7 +11,7 @@ import MapEvent from './MapEvent.js';
import MapEventType from './MapEventType.js'; import MapEventType from './MapEventType.js';
import _ol_MapProperty_ from './MapProperty.js'; import _ol_MapProperty_ from './MapProperty.js';
import _ol_Object_ from './Object.js'; import _ol_Object_ from './Object.js';
import _ol_ObjectEventType_ from './ObjectEventType.js'; import ObjectEventType from './ObjectEventType.js';
import TileQueue from './TileQueue.js'; import TileQueue from './TileQueue.js';
import _ol_View_ from './View.js'; import _ol_View_ from './View.js';
import _ol_ViewHint_ from './ViewHint.js'; import _ol_ViewHint_ from './ViewHint.js';
@@ -1072,7 +1072,7 @@ _ol_PluggableMap_.prototype.handleViewChanged_ = function() {
if (view) { if (view) {
this.viewport_.setAttribute('data-view', getUid(view)); this.viewport_.setAttribute('data-view', getUid(view));
this.viewPropertyListenerKey_ = _ol_events_.listen( this.viewPropertyListenerKey_ = _ol_events_.listen(
view, _ol_ObjectEventType_.PROPERTYCHANGE, view, ObjectEventType.PROPERTYCHANGE,
this.handleViewPropertyChanged_, this); this.handleViewPropertyChanged_, this);
this.viewChangeListenerKey_ = _ol_events_.listen( this.viewChangeListenerKey_ = _ol_events_.listen(
view, EventType.CHANGE, view, EventType.CHANGE,
@@ -1094,7 +1094,7 @@ _ol_PluggableMap_.prototype.handleLayerGroupChanged_ = function() {
if (layerGroup) { if (layerGroup) {
this.layerGroupPropertyListenerKeys_ = [ this.layerGroupPropertyListenerKeys_ = [
_ol_events_.listen( _ol_events_.listen(
layerGroup, _ol_ObjectEventType_.PROPERTYCHANGE, layerGroup, ObjectEventType.PROPERTYCHANGE,
this.render, this), this.render, this),
_ol_events_.listen( _ol_events_.listen(
layerGroup, EventType.CHANGE, layerGroup, EventType.CHANGE,

4
src/ol/control/OverviewMap.js
View File

@@ -7,7 +7,7 @@ import _ol_PluggableMap_ from '../PluggableMap.js';
import MapEventType from '../MapEventType.js'; import MapEventType from '../MapEventType.js';
import _ol_MapProperty_ from '../MapProperty.js'; import _ol_MapProperty_ from '../MapProperty.js';
import _ol_Object_ from '../Object.js'; import _ol_Object_ from '../Object.js';
import _ol_ObjectEventType_ from '../ObjectEventType.js'; import ObjectEventType from '../ObjectEventType.js';
import _ol_Overlay_ from '../Overlay.js'; import _ol_Overlay_ from '../Overlay.js';
import _ol_OverlayPositioning_ from '../OverlayPositioning.js'; import _ol_OverlayPositioning_ from '../OverlayPositioning.js';
import _ol_ViewProperty_ from '../ViewProperty.js'; import _ol_ViewProperty_ from '../ViewProperty.js';
@@ -227,7 +227,7 @@ OverviewMap.prototype.setMap = function(map) {
if (map) { if (map) {
this.ovmap_.setTarget(this.ovmapDiv_); this.ovmap_.setTarget(this.ovmapDiv_);
this.listenerKeys.push(_ol_events_.listen( this.listenerKeys.push(_ol_events_.listen(
map, _ol_ObjectEventType_.PROPERTYCHANGE, map, ObjectEventType.PROPERTYCHANGE,
this.handleMapPropertyChange_, this)); this.handleMapPropertyChange_, this));
// TODO: to really support map switching, this would need to be reworked // TODO: to really support map switching, this would need to be reworked

6
src/ol/layer/Group.js
View File

@@ -5,7 +5,7 @@ import {getUid, inherits} from '../index.js';
import _ol_Collection_ from '../Collection.js'; import _ol_Collection_ from '../Collection.js';
import CollectionEventType from '../CollectionEventType.js'; import CollectionEventType from '../CollectionEventType.js';
import _ol_Object_ from '../Object.js'; import _ol_Object_ from '../Object.js';
import _ol_ObjectEventType_ from '../ObjectEventType.js'; import ObjectEventType from '../ObjectEventType.js';
import {assert} from '../asserts.js'; import {assert} from '../asserts.js';
import _ol_events_ from '../events.js'; import _ol_events_ from '../events.js';
import EventType from '../events/EventType.js'; import EventType from '../events/EventType.js';
@@ -104,7 +104,7 @@ _ol_layer_Group_.prototype.handleLayersChanged_ = function(event) {
for (i = 0, ii = layersArray.length; i < ii; i++) { for (i = 0, ii = layersArray.length; i < ii; i++) {
layer = layersArray[i]; layer = layersArray[i];
this.listenerKeys_[getUid(layer).toString()] = [ this.listenerKeys_[getUid(layer).toString()] = [
_ol_events_.listen(layer, _ol_ObjectEventType_.PROPERTYCHANGE, _ol_events_.listen(layer, ObjectEventType.PROPERTYCHANGE,
this.handleLayerChange_, this), this.handleLayerChange_, this),
_ol_events_.listen(layer, EventType.CHANGE, _ol_events_.listen(layer, EventType.CHANGE,
this.handleLayerChange_, this) this.handleLayerChange_, this)
@@ -123,7 +123,7 @@ _ol_layer_Group_.prototype.handleLayersAdd_ = function(collectionEvent) {
var layer = /** @type {ol.layer.Base} */ (collectionEvent.element); var layer = /** @type {ol.layer.Base} */ (collectionEvent.element);
var key = getUid(layer).toString(); var key = getUid(layer).toString();
this.listenerKeys_[key] = [ this.listenerKeys_[key] = [
_ol_events_.listen(layer, _ol_ObjectEventType_.PROPERTYCHANGE, _ol_events_.listen(layer, ObjectEventType.PROPERTYCHANGE,
this.handleLayerChange_, this), this.handleLayerChange_, this),
_ol_events_.listen(layer, EventType.CHANGE, _ol_events_.listen(layer, EventType.CHANGE,
this.handleLayerChange_, this) this.handleLayerChange_, this)

4
src/ol/source/Vector.js
View File

@@ -5,7 +5,7 @@
import {getUid, inherits, nullFunction} from '../index.js'; import {getUid, inherits, nullFunction} from '../index.js';
import _ol_Collection_ from '../Collection.js'; import _ol_Collection_ from '../Collection.js';
import CollectionEventType from '../CollectionEventType.js'; import CollectionEventType from '../CollectionEventType.js';
import _ol_ObjectEventType_ from '../ObjectEventType.js'; import ObjectEventType from '../ObjectEventType.js';
import _ol_array_ from '../array.js'; import _ol_array_ from '../array.js';
import {assert} from '../asserts.js'; import {assert} from '../asserts.js';
import _ol_events_ from '../events.js'; import _ol_events_ from '../events.js';
@@ -205,7 +205,7 @@ _ol_source_Vector_.prototype.setupChangeEvents_ = function(featureKey, feature)
this.featureChangeKeys_[featureKey] = [ this.featureChangeKeys_[featureKey] = [
_ol_events_.listen(feature, EventType.CHANGE, _ol_events_.listen(feature, EventType.CHANGE,
this.handleFeatureChange_, this), this.handleFeatureChange_, this),
_ol_events_.listen(feature, _ol_ObjectEventType_.PROPERTYCHANGE, _ol_events_.listen(feature, ObjectEventType.PROPERTYCHANGE,
this.handleFeatureChange_, this) this.handleFeatureChange_, this)
]; ];
}; };