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

Use ol.inherits instead of goog.inherits

Browse Source
This commit is contained in:
Frederic Junod
2016-04-07 16:26:11 +02:00
parent 072728b083
commit e289bfbb7d
166 changed files with 448 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/layer/heatmaplayer.js
View File

@@ -46,7 +46,7 @@ ol.layer.Heatmap = function(opt_options) {
delete baseOptions.blur;
delete baseOptions.shadow;
delete baseOptions.weight;
goog.base(this, /** @type {olx.layer.VectorOptions} */ (baseOptions));
ol.layer.Vector.call(this, /** @type {olx.layer.VectorOptions} */ (baseOptions));
/**
* @private
@@ -134,7 +134,7 @@ ol.layer.Heatmap = function(opt_options) {
ol.events.listen(this, ol.render.EventType.RENDER, this.handleRender_, this);
};
goog.inherits(ol.layer.Heatmap, ol.layer.Vector);
ol.inherits(ol.layer.Heatmap, ol.layer.Vector);
/**

4
src/ol/layer/imagelayer.js
View File

@@ -19,9 +19,9 @@ goog.require('ol.layer.Layer');
*/
ol.layer.Image = function(opt_options) {
var options = opt_options ? opt_options : {};
goog.base(this, /** @type {olx.layer.LayerOptions} */ (options));
ol.layer.Layer.call(this, /** @type {olx.layer.LayerOptions} */ (options));
};
goog.inherits(ol.layer.Image, ol.layer.Layer);
ol.inherits(ol.layer.Image, ol.layer.Layer);
/**

4
src/ol/layer/layer.js
View File

@@ -37,7 +37,7 @@ ol.layer.Layer = function(options) {
var baseOptions = ol.object.assign({}, options);
delete baseOptions.source;
goog.base(this, /** @type {olx.layer.BaseOptions} */ (baseOptions));
ol.layer.Base.call(this, /** @type {olx.layer.BaseOptions} */ (baseOptions));
/**
* @private
@@ -68,7 +68,7 @@ ol.layer.Layer = function(options) {
var source = options.source ? options.source : null;
this.setSource(source);
};
goog.inherits(ol.layer.Layer, ol.layer.Base);
ol.inherits(ol.layer.Layer, ol.layer.Base);
/**

4
src/ol/layer/layerbase.js
View File

@@ -37,7 +37,7 @@ ol.layer.LayerProperty = {
*/
ol.layer.Base = function(options) {
goog.base(this);
ol.Object.call(this);
/**
* @type {Object.<string, *>}
@@ -56,7 +56,7 @@ ol.layer.Base = function(options) {
this.setProperties(properties);
};
goog.inherits(ol.layer.Base, ol.Object);
ol.inherits(ol.layer.Base, ol.Object);
/**

4
src/ol/layer/layergroup.js
View File

@@ -42,7 +42,7 @@ ol.layer.Group = function(opt_options) {
var layers = options.layers;
goog.base(this, baseOptions);
ol.layer.Base.call(this, baseOptions);
/**
* @private
@@ -75,7 +75,7 @@ ol.layer.Group = function(opt_options) {
this.setLayers(layers);
};
goog.inherits(ol.layer.Group, ol.layer.Base);
ol.inherits(ol.layer.Group, ol.layer.Base);
/**

4
src/ol/layer/tilelayer.js
View File

@@ -35,13 +35,13 @@ ol.layer.Tile = function(opt_options) {
delete baseOptions.preload;
delete baseOptions.useInterimTilesOnError;
goog.base(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
ol.layer.Layer.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
this.setPreload(options.preload !== undefined ? options.preload : 0);
this.setUseInterimTilesOnError(options.useInterimTilesOnError !== undefined ?
options.useInterimTilesOnError : true);
};
goog.inherits(ol.layer.Tile, ol.layer.Layer);
ol.inherits(ol.layer.Tile, ol.layer.Layer);
/**

4
src/ol/layer/vectorlayer.js
View File

@@ -44,7 +44,7 @@ ol.layer.Vector = function(opt_options) {
delete baseOptions.renderBuffer;
delete baseOptions.updateWhileAnimating;
delete baseOptions.updateWhileInteracting;
goog.base(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
ol.layer.Layer.call(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
/**
* @type {number}
@@ -84,7 +84,7 @@ ol.layer.Vector = function(opt_options) {
options.updateWhileInteracting : false;
};
goog.inherits(ol.layer.Vector, ol.layer.Layer);
ol.inherits(ol.layer.Vector, ol.layer.Layer);
/**

4
src/ol/layer/vectortilelayer.js
View File

@@ -53,7 +53,7 @@ ol.layer.VectorTile = function(opt_options) {
delete baseOptions.preload;
delete baseOptions.useInterimTilesOnError;
goog.base(this, /** @type {olx.layer.VectorOptions} */ (baseOptions));
ol.layer.Vector.call(this, /** @type {olx.layer.VectorOptions} */ (baseOptions));
this.setPreload(options.preload ? options.preload : 0);
this.setUseInterimTilesOnError(options.useInterimTilesOnError ?
@@ -72,7 +72,7 @@ ol.layer.VectorTile = function(opt_options) {
this.renderMode_ = options.renderMode || ol.layer.VectorTileRenderType.HYBRID;
};
goog.inherits(ol.layer.VectorTile, ol.layer.Vector);
ol.inherits(ol.layer.VectorTile, ol.layer.Vector);
/**