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/renderer/canvas/canvasimagelayerrenderer.js
View File

@@ -21,7 +21,7 @@ goog.require('ol.vec.Mat4');
*/
ol.renderer.canvas.ImageLayer = function(imageLayer) {
goog.base(this, imageLayer);
ol.renderer.canvas.Layer.call(this, imageLayer);
/**
* @private
@@ -48,7 +48,7 @@ ol.renderer.canvas.ImageLayer = function(imageLayer) {
this.hitCanvasContext_ = null;
};
goog.inherits(ol.renderer.canvas.ImageLayer, ol.renderer.canvas.Layer);
ol.inherits(ol.renderer.canvas.ImageLayer, ol.renderer.canvas.Layer);
/**

4
src/ol/renderer/canvas/canvaslayerrenderer.js
View File

@@ -19,7 +19,7 @@ goog.require('ol.vec.Mat4');
*/
ol.renderer.canvas.Layer = function(layer) {
goog.base(this, layer);
ol.renderer.Layer.call(this, layer);
/**
* @private
@@ -28,7 +28,7 @@ ol.renderer.canvas.Layer = function(layer) {
this.transform_ = goog.vec.Mat4.createNumber();
};
goog.inherits(ol.renderer.canvas.Layer, ol.renderer.Layer);
ol.inherits(ol.renderer.canvas.Layer, ol.renderer.Layer);
/**

4
src/ol/renderer/canvas/canvasmaprenderer.js
View File

@@ -38,7 +38,7 @@ goog.require('ol.vec.Mat4');
*/
ol.renderer.canvas.Map = function(container, map) {
goog.base(this, container, map);
ol.renderer.Map.call(this, container, map);
/**
* @private
@@ -70,7 +70,7 @@ ol.renderer.canvas.Map = function(container, map) {
this.transform_ = goog.vec.Mat4.createNumber();
};
goog.inherits(ol.renderer.canvas.Map, ol.renderer.Map);
ol.inherits(ol.renderer.canvas.Map, ol.renderer.Map);
/**

4
src/ol/renderer/canvas/canvastilelayerrenderer.js
View File

@@ -23,7 +23,7 @@ goog.require('ol.vec.Mat4');
*/
ol.renderer.canvas.TileLayer = function(tileLayer) {
goog.base(this, tileLayer);
ol.renderer.canvas.Layer.call(this, tileLayer);
/**
* @protected
@@ -62,7 +62,7 @@ ol.renderer.canvas.TileLayer = function(tileLayer) {
this.zDirection = 0;
};
goog.inherits(ol.renderer.canvas.TileLayer, ol.renderer.canvas.Layer);
ol.inherits(ol.renderer.canvas.TileLayer, ol.renderer.canvas.Layer);
/**

4
src/ol/renderer/canvas/canvasvectorlayerrenderer.js
View File

@@ -21,7 +21,7 @@ goog.require('ol.source.Vector');
*/
ol.renderer.canvas.VectorLayer = function(vectorLayer) {
goog.base(this, vectorLayer);
ol.renderer.canvas.Layer.call(this, vectorLayer);
/**
* @private
@@ -66,7 +66,7 @@ ol.renderer.canvas.VectorLayer = function(vectorLayer) {
this.context_ = ol.dom.createCanvasContext2D();
};
goog.inherits(ol.renderer.canvas.VectorLayer, ol.renderer.canvas.Layer);
ol.inherits(ol.renderer.canvas.VectorLayer, ol.renderer.canvas.Layer);
/**

6
src/ol/renderer/canvas/canvasvectortilelayerrenderer.js
View File

@@ -47,7 +47,7 @@ ol.renderer.canvas.VECTOR_REPLAYS = {
*/
ol.renderer.canvas.VectorTileLayer = function(layer) {
goog.base(this, layer);
ol.renderer.canvas.TileLayer.call(this, layer);
/**
* @private
@@ -66,7 +66,7 @@ ol.renderer.canvas.VectorTileLayer = function(layer) {
layer.getRenderMode() == ol.layer.VectorTileRenderType.VECTOR ? 1 : 0;
};
goog.inherits(ol.renderer.canvas.VectorTileLayer, ol.renderer.canvas.TileLayer);
ol.inherits(ol.renderer.canvas.VectorTileLayer, ol.renderer.canvas.TileLayer);
/**
@@ -342,7 +342,7 @@ ol.renderer.canvas.VectorTileLayer.prototype.handleStyleImageChange_ = function(
* @inheritDoc
*/
ol.renderer.canvas.VectorTileLayer.prototype.prepareFrame = function(frameState, layerState) {
var prepared = goog.base(this, 'prepareFrame', frameState, layerState);
var prepared = ol.renderer.canvas.TileLayer.prototype.prepareFrame.call(this, frameState, layerState);
if (prepared) {
var skippedFeatures = Object.keys(frameState.skippedFeatureUids_ || {});
for (var i = 0, ii = this.renderedTiles.length; i < ii; ++i) {

4
src/ol/renderer/dom/domimagelayerrenderer.js
View File

@@ -22,7 +22,7 @@ ol.renderer.dom.ImageLayer = function(imageLayer) {
var target = document.createElement('DIV');
target.style.position = 'absolute';
goog.base(this, imageLayer, target);
ol.renderer.dom.Layer.call(this, imageLayer, target);
/**
* The last rendered image.
@@ -38,7 +38,7 @@ ol.renderer.dom.ImageLayer = function(imageLayer) {
this.transform_ = goog.vec.Mat4.createNumberIdentity();
};
goog.inherits(ol.renderer.dom.ImageLayer, ol.renderer.dom.Layer);
ol.inherits(ol.renderer.dom.ImageLayer, ol.renderer.dom.Layer);
/**

4
src/ol/renderer/dom/domlayerrenderer.js
View File

@@ -13,7 +13,7 @@ goog.require('ol.renderer.Layer');
*/
ol.renderer.dom.Layer = function(layer, target) {
goog.base(this, layer);
ol.renderer.Layer.call(this, layer);
/**
* @type {!Element}
@@ -22,7 +22,7 @@ ol.renderer.dom.Layer = function(layer, target) {
this.target = target;
};
goog.inherits(ol.renderer.dom.Layer, ol.renderer.Layer);
ol.inherits(ol.renderer.dom.Layer, ol.renderer.Layer);
/**

6
src/ol/renderer/dom/dommaprenderer.js
View File

@@ -36,7 +36,7 @@ goog.require('ol.vec.Mat4');
*/
ol.renderer.dom.Map = function(container, map) {
goog.base(this, container, map);
ol.renderer.Map.call(this, container, map);
/**
* @private
@@ -80,7 +80,7 @@ ol.renderer.dom.Map = function(container, map) {
this.renderedVisible_ = true;
};
goog.inherits(ol.renderer.dom.Map, ol.renderer.Map);
ol.inherits(ol.renderer.dom.Map, ol.renderer.Map);
/**
@@ -88,7 +88,7 @@ goog.inherits(ol.renderer.dom.Map, ol.renderer.Map);
*/
ol.renderer.dom.Map.prototype.disposeInternal = function() {
goog.dom.removeNode(this.layersPane_);
goog.base(this, 'disposeInternal');
ol.renderer.Map.prototype.disposeInternal.call(this);
};

4
src/ol/renderer/dom/domtilelayerrenderer.js
View File

@@ -31,7 +31,7 @@ ol.renderer.dom.TileLayer = function(tileLayer) {
var target = document.createElement('DIV');
target.style.position = 'absolute';
goog.base(this, tileLayer, target);
ol.renderer.dom.Layer.call(this, tileLayer, target);
/**
* @private
@@ -58,7 +58,7 @@ ol.renderer.dom.TileLayer = function(tileLayer) {
this.tileLayerZs_ = {};
};
goog.inherits(ol.renderer.dom.TileLayer, ol.renderer.dom.Layer);
ol.inherits(ol.renderer.dom.TileLayer, ol.renderer.dom.Layer);
/**

4
src/ol/renderer/dom/domvectorlayerrenderer.js
View File

@@ -36,7 +36,7 @@ ol.renderer.dom.VectorLayer = function(vectorLayer) {
target.style.maxWidth = 'none';
target.style.position = 'absolute';
goog.base(this, vectorLayer, target);
ol.renderer.dom.Layer.call(this, vectorLayer, target);
/**
* @private
@@ -87,7 +87,7 @@ ol.renderer.dom.VectorLayer = function(vectorLayer) {
this.elementTransform_ = goog.vec.Mat4.createNumber();
};
goog.inherits(ol.renderer.dom.VectorLayer, ol.renderer.dom.Layer);
ol.inherits(ol.renderer.dom.VectorLayer, ol.renderer.dom.Layer);
/**

4
src/ol/renderer/layerrenderer.js
View File

@@ -24,7 +24,7 @@ goog.require('ol.vec.Mat4');
*/
ol.renderer.Layer = function(layer) {
goog.base(this);
ol.Observable.call(this);
/**
* @private
@@ -34,7 +34,7 @@ ol.renderer.Layer = function(layer) {
};
goog.inherits(ol.renderer.Layer, ol.Observable);
ol.inherits(ol.renderer.Layer, ol.Observable);
/**

4
src/ol/renderer/maprenderer.js
View File

@@ -35,7 +35,7 @@ ol.RendererType = {
*/
ol.renderer.Map = function(container, map) {
goog.base(this);
ol.Disposable.call(this);
/**
@@ -57,7 +57,7 @@ ol.renderer.Map = function(container, map) {
this.layerRendererListeners_ = {};
};
goog.inherits(ol.renderer.Map, ol.Disposable);
ol.inherits(ol.renderer.Map, ol.Disposable);
/**

4
src/ol/renderer/webgl/webglimagelayerrenderer.js
View File

@@ -24,7 +24,7 @@ goog.require('ol.webgl.Context');
*/
ol.renderer.webgl.ImageLayer = function(mapRenderer, imageLayer) {
goog.base(this, mapRenderer, imageLayer);
ol.renderer.webgl.Layer.call(this, mapRenderer, imageLayer);
/**
* The last rendered image.
@@ -46,7 +46,7 @@ ol.renderer.webgl.ImageLayer = function(mapRenderer, imageLayer) {
this.hitTransformationMatrix_ = null;
};
goog.inherits(ol.renderer.webgl.ImageLayer, ol.renderer.webgl.Layer);
ol.inherits(ol.renderer.webgl.ImageLayer, ol.renderer.webgl.Layer);
/**

4
src/ol/renderer/webgl/webgllayerrenderer.js
View File

@@ -23,7 +23,7 @@ goog.require('ol.webgl.Context');
*/
ol.renderer.webgl.Layer = function(mapRenderer, layer) {
goog.base(this, layer);
ol.renderer.Layer.call(this, layer);
/**
* @protected
@@ -79,7 +79,7 @@ ol.renderer.webgl.Layer = function(mapRenderer, layer) {
this.defaultLocations_ = null;
};
goog.inherits(ol.renderer.webgl.Layer, ol.renderer.Layer);
ol.inherits(ol.renderer.webgl.Layer, ol.renderer.Layer);
/**

8
src/ol/renderer/webgl/webglmapdefaultshader.js
View File

@@ -13,9 +13,9 @@ goog.require('ol.webgl.shader');
* @struct
*/
ol.renderer.webgl.map.shader.DefaultFragment = function() {
goog.base(this, ol.renderer.webgl.map.shader.DefaultFragment.SOURCE);
ol.webgl.shader.Fragment.call(this, ol.renderer.webgl.map.shader.DefaultFragment.SOURCE);
};
goog.inherits(ol.renderer.webgl.map.shader.DefaultFragment, ol.webgl.shader.Fragment);
ol.inherits(ol.renderer.webgl.map.shader.DefaultFragment, ol.webgl.shader.Fragment);
goog.addSingletonGetter(ol.renderer.webgl.map.shader.DefaultFragment);
@@ -48,9 +48,9 @@ ol.renderer.webgl.map.shader.DefaultFragment.SOURCE = goog.DEBUG ?
* @struct
*/
ol.renderer.webgl.map.shader.DefaultVertex = function() {
goog.base(this, ol.renderer.webgl.map.shader.DefaultVertex.SOURCE);
ol.webgl.shader.Vertex.call(this, ol.renderer.webgl.map.shader.DefaultVertex.SOURCE);
};
goog.inherits(ol.renderer.webgl.map.shader.DefaultVertex, ol.webgl.shader.Vertex);
ol.inherits(ol.renderer.webgl.map.shader.DefaultVertex, ol.webgl.shader.Vertex);
goog.addSingletonGetter(ol.renderer.webgl.map.shader.DefaultVertex);

6
src/ol/renderer/webgl/webglmaprenderer.js
View File

@@ -41,7 +41,7 @@ goog.require('ol.webgl.WebGLContextEventType');
*/
ol.renderer.webgl.Map = function(container, map) {
goog.base(this, container, map);
ol.renderer.Map.call(this, container, map);
/**
* @private
@@ -171,7 +171,7 @@ ol.renderer.webgl.Map = function(container, map) {
this.initializeGL_();
};
goog.inherits(ol.renderer.webgl.Map, ol.renderer.Map);
ol.inherits(ol.renderer.webgl.Map, ol.renderer.Map);
/**
@@ -304,7 +304,7 @@ ol.renderer.webgl.Map.prototype.disposeInternal = function() {
});
}
this.context_.dispose();
goog.base(this, 'disposeInternal');
ol.renderer.Map.prototype.disposeInternal.call(this);
};

8
src/ol/renderer/webgl/webgltilelayerrenderer.js
View File

@@ -30,7 +30,7 @@ goog.require('ol.webgl.Buffer');
*/
ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) {
goog.base(this, mapRenderer, tileLayer);
ol.renderer.webgl.Layer.call(this, mapRenderer, tileLayer);
/**
* @private
@@ -87,7 +87,7 @@ ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) {
this.tmpSize_ = [0, 0];
};
goog.inherits(ol.renderer.webgl.TileLayer, ol.renderer.webgl.Layer);
ol.inherits(ol.renderer.webgl.TileLayer, ol.renderer.webgl.Layer);
/**
@@ -96,7 +96,7 @@ goog.inherits(ol.renderer.webgl.TileLayer, ol.renderer.webgl.Layer);
ol.renderer.webgl.TileLayer.prototype.disposeInternal = function() {
var context = this.mapRenderer.getContext();
context.deleteBuffer(this.renderArrayBuffer_);
goog.base(this, 'disposeInternal');
ol.renderer.webgl.Layer.prototype.disposeInternal.call(this);
};
@@ -140,7 +140,7 @@ ol.renderer.webgl.TileLayer.prototype.createLoadedTileFinder = function(source,
* @inheritDoc
*/
ol.renderer.webgl.TileLayer.prototype.handleWebGLContextLost = function() {
goog.base(this, 'handleWebGLContextLost');
ol.renderer.webgl.Layer.prototype.handleWebGLContextLost.call(this);
this.locations_ = null;
};

8
src/ol/renderer/webgl/webgltilelayershader.js
View File

@@ -13,9 +13,9 @@ goog.require('ol.webgl.shader');
* @struct
*/
ol.renderer.webgl.tilelayer.shader.Fragment = function() {
goog.base(this, ol.renderer.webgl.tilelayer.shader.Fragment.SOURCE);
ol.webgl.shader.Fragment.call(this, ol.renderer.webgl.tilelayer.shader.Fragment.SOURCE);
};
goog.inherits(ol.renderer.webgl.tilelayer.shader.Fragment, ol.webgl.shader.Fragment);
ol.inherits(ol.renderer.webgl.tilelayer.shader.Fragment, ol.webgl.shader.Fragment);
goog.addSingletonGetter(ol.renderer.webgl.tilelayer.shader.Fragment);
@@ -48,9 +48,9 @@ ol.renderer.webgl.tilelayer.shader.Fragment.SOURCE = goog.DEBUG ?
* @struct
*/
ol.renderer.webgl.tilelayer.shader.Vertex = function() {
goog.base(this, ol.renderer.webgl.tilelayer.shader.Vertex.SOURCE);
ol.webgl.shader.Vertex.call(this, ol.renderer.webgl.tilelayer.shader.Vertex.SOURCE);
};
goog.inherits(ol.renderer.webgl.tilelayer.shader.Vertex, ol.webgl.shader.Vertex);
ol.inherits(ol.renderer.webgl.tilelayer.shader.Vertex, ol.webgl.shader.Vertex);
goog.addSingletonGetter(ol.renderer.webgl.tilelayer.shader.Vertex);

6
src/ol/renderer/webgl/webglvectorlayerrenderer.js
View File

@@ -19,7 +19,7 @@ goog.require('ol.vec.Mat4');
*/
ol.renderer.webgl.VectorLayer = function(mapRenderer, vectorLayer) {
goog.base(this, mapRenderer, vectorLayer);
ol.renderer.webgl.Layer.call(this, mapRenderer, vectorLayer);
/**
* @private
@@ -65,7 +65,7 @@ ol.renderer.webgl.VectorLayer = function(mapRenderer, vectorLayer) {
this.layerState_ = null;
};
goog.inherits(ol.renderer.webgl.VectorLayer, ol.renderer.webgl.Layer);
ol.inherits(ol.renderer.webgl.VectorLayer, ol.renderer.webgl.Layer);
/**
@@ -95,7 +95,7 @@ ol.renderer.webgl.VectorLayer.prototype.disposeInternal = function() {
replayGroup.getDeleteResourcesFunction(context)();
this.replayGroup_ = null;
}
goog.base(this, 'disposeInternal');
ol.renderer.webgl.Layer.prototype.disposeInternal.call(this);
};