Remove static members from BaseObject

This commit is contained in:
Tim Schaub
2018-02-25 08:48:53 -07:00
parent ef92649017
commit 4e6cf58de1
13 changed files with 76 additions and 73 deletions

View File

@@ -4,7 +4,7 @@
import {getUid, inherits} from '../index.js';
import Collection from '../Collection.js';
import CollectionEventType from '../CollectionEventType.js';
import BaseObject from '../Object.js';
import {getChangeEventType} from '../Object.js';
import ObjectEventType from '../ObjectEventType.js';
import {assert} from '../asserts.js';
import {listen, unlistenByKey} from '../events.js';
@@ -58,7 +58,7 @@ const LayerGroup = function(opt_options) {
this.listenerKeys_ = {};
listen(this,
BaseObject.getChangeEventType(Property.LAYERS),
getChangeEventType(Property.LAYERS),
this.handleLayersChanged_, this);
if (layers) {

View File

@@ -3,7 +3,7 @@
*/
import {listen} from '../events.js';
import {inherits} from '../index.js';
import BaseObject from '../Object.js';
import {getChangeEventType} from '../Object.js';
import {createCanvasContext2D} from '../dom.js';
import VectorLayer from '../layer/Vector.js';
import {clamp} from '../math.js';
@@ -81,7 +81,7 @@ const Heatmap = function(opt_options) {
this.styleCache_ = null;
listen(this,
BaseObject.getChangeEventType(Property.GRADIENT),
getChangeEventType(Property.GRADIENT),
this.handleGradientChanged_, this);
this.setGradient(options.gradient ? options.gradient : DEFAULT_GRADIENT);
@@ -91,10 +91,10 @@ const Heatmap = function(opt_options) {
this.setRadius(options.radius !== undefined ? options.radius : 8);
listen(this,
BaseObject.getChangeEventType(Property.BLUR),
getChangeEventType(Property.BLUR),
this.handleStyleChanged_, this);
listen(this,
BaseObject.getChangeEventType(Property.RADIUS),
getChangeEventType(Property.RADIUS),
this.handleStyleChanged_, this);
this.handleStyleChanged_();

View File

@@ -4,7 +4,7 @@
import {listen, unlistenByKey} from '../events.js';
import EventType from '../events/EventType.js';
import {getUid, inherits} from '../index.js';
import BaseObject from '../Object.js';
import {getChangeEventType} from '../Object.js';
import BaseLayer from '../layer/Base.js';
import LayerProperty from '../layer/Property.js';
import {assign} from '../obj.js';
@@ -63,7 +63,7 @@ const Layer = function(options) {
}
listen(this,
BaseObject.getChangeEventType(LayerProperty.SOURCE),
getChangeEventType(LayerProperty.SOURCE),
this.handleSourcePropertyChange_, this);
const source = options.source ? options.source : null;