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

Rename _ol_Object_ to BaseObject

Browse Source
This commit is contained in:
Tim Schaub
2018-01-08 10:03:31 -07:00
parent 35db8721b2
commit 24dd0ca924
21 changed files with 95 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/control/Control.js
+4 -4
View File
@@ -3,7 +3,7 @@
*/
import {inherits, nullFunction} from '../index.js';
import MapEventType from '../MapEventType.js';
import _ol_Object_ from '../Object.js';
import BaseObject from '../Object.js';
import {removeNode} from '../dom.js';
import _ol_events_ from '../events.js';
@@ -38,7 +38,7 @@ import _ol_events_ from '../events.js';
*/
var Control = function(options) {
_ol_Object_.call(this);
BaseObject.call(this);
/**
* @protected
@@ -75,7 +75,7 @@ var Control = function(options) {
};
inherits(Control, _ol_Object_);
inherits(Control, BaseObject);
/**
@@ -83,7 +83,7 @@ inherits(Control, _ol_Object_);
*/
Control.prototype.disposeInternal = function() {
removeNode(this.element);
_ol_Object_.prototype.disposeInternal.call(this);
BaseObject.prototype.disposeInternal.call(this);
};
src/ol/control/MousePosition.js
+2 -2
View File
@@ -5,7 +5,7 @@
import {inherits} from '../index.js';
import _ol_events_ from '../events.js';
import EventType from '../events/EventType.js';
import _ol_Object_ from '../Object.js';
import BaseObject from '../Object.js';
import Control from '../control/Control.js';
import {getTransformFromProjections, identityTransform, get as getProjection} from '../proj.js';
@@ -39,7 +39,7 @@ var MousePosition = function(opt_options) {
});
_ol_events_.listen(this,
_ol_Object_.getChangeEventType(MousePosition.Property_.PROJECTION),
BaseObject.getChangeEventType(MousePosition.Property_.PROJECTION),
this.handleProjectionChanged_, this);
if (options.coordinateFormat) {
src/ol/control/OverviewMap.js
+3 -3
View File
@@ -6,7 +6,7 @@ import _ol_Collection_ from '../Collection.js';
import PluggableMap from '../PluggableMap.js';
import MapEventType from '../MapEventType.js';
import _ol_MapProperty_ from '../MapProperty.js';
import _ol_Object_ from '../Object.js';
import BaseObject from '../Object.js';
import ObjectEventType from '../ObjectEventType.js';
import Overlay from '../Overlay.js';
import OverlayPositioning from '../OverlayPositioning.js';
@@ -270,7 +270,7 @@ OverviewMap.prototype.handleMapPropertyChange_ = function(event) {
*/
OverviewMap.prototype.bindView_ = function(view) {
_ol_events_.listen(view,
_ol_Object_.getChangeEventType(ViewProperty.ROTATION),
BaseObject.getChangeEventType(ViewProperty.ROTATION),
this.handleRotationChanged_, this);
};
@@ -282,7 +282,7 @@ OverviewMap.prototype.bindView_ = function(view) {
*/
OverviewMap.prototype.unbindView_ = function(view) {
_ol_events_.unlisten(view,
_ol_Object_.getChangeEventType(ViewProperty.ROTATION),
BaseObject.getChangeEventType(ViewProperty.ROTATION),
this.handleRotationChanged_, this);
};
src/ol/control/ScaleLine.js
+2 -2
View File
@@ -2,7 +2,7 @@
* @module ol/control/ScaleLine
*/
import {inherits} from '../index.js';
import _ol_Object_ from '../Object.js';
import BaseObject from '../Object.js';
import {assert} from '../asserts.js';
import Control from '../control/Control.js';
import ScaleLineUnits from '../control/ScaleLineUnits.js';
@@ -86,7 +86,7 @@ var ScaleLine = function(opt_options) {
});
_ol_events_.listen(
this, _ol_Object_.getChangeEventType(ScaleLine.Property_.UNITS),
this, BaseObject.getChangeEventType(ScaleLine.Property_.UNITS),
this.handleUnitsChanged_, this);
this.setUnits(/** @type {ol.control.ScaleLineUnits} */ (options.units) ||