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/render/canvas/canvasimmediate.js
View File

@@ -37,7 +37,7 @@ goog.require('ol.vec.Mat4');
* @struct
*/
ol.render.canvas.Immediate = function(context, pixelRatio, extent, transform, viewRotation) {
goog.base(this);
ol.render.VectorContext.call(this);
/**
* @private
@@ -232,7 +232,7 @@ ol.render.canvas.Immediate = function(context, pixelRatio, extent, transform, vi
this.tmpLocalTransform_ = goog.vec.Mat4.createNumber();
};
goog.inherits(ol.render.canvas.Immediate, ol.render.VectorContext);
ol.inherits(ol.render.canvas.Immediate, ol.render.VectorContext);
/**

20
src/ol/render/canvas/canvasreplay.js
View File

@@ -57,7 +57,7 @@ ol.render.canvas.Instruction = {
* @struct
*/
ol.render.canvas.Replay = function(tolerance, maxExtent, resolution) {
goog.base(this);
ol.render.VectorContext.call(this);
/**
* @protected
@@ -145,7 +145,7 @@ ol.render.canvas.Replay = function(tolerance, maxExtent, resolution) {
*/
this.tmpLocalTransformInv_ = goog.vec.Mat4.createNumber();
};
goog.inherits(ol.render.canvas.Replay, ol.render.VectorContext);
ol.inherits(ol.render.canvas.Replay, ol.render.VectorContext);
/**
@@ -678,7 +678,7 @@ ol.render.canvas.Replay.prototype.getBufferedMaxExtent = function() {
* @struct
*/
ol.render.canvas.ImageReplay = function(tolerance, maxExtent, resolution) {
goog.base(this, tolerance, maxExtent, resolution);
ol.render.canvas.Replay.call(this, tolerance, maxExtent, resolution);
/**
* @private
@@ -759,7 +759,7 @@ ol.render.canvas.ImageReplay = function(tolerance, maxExtent, resolution) {
this.width_ = undefined;
};
goog.inherits(ol.render.canvas.ImageReplay, ol.render.canvas.Replay);
ol.inherits(ol.render.canvas.ImageReplay, ol.render.canvas.Replay);
/**
@@ -945,7 +945,7 @@ ol.render.canvas.ImageReplay.prototype.setImageStyle = function(imageStyle) {
*/
ol.render.canvas.LineStringReplay = function(tolerance, maxExtent, resolution) {
goog.base(this, tolerance, maxExtent, resolution);
ol.render.canvas.Replay.call(this, tolerance, maxExtent, resolution);
/**
* @private
@@ -980,7 +980,7 @@ ol.render.canvas.LineStringReplay = function(tolerance, maxExtent, resolution) {
};
};
goog.inherits(ol.render.canvas.LineStringReplay, ol.render.canvas.Replay);
ol.inherits(ol.render.canvas.LineStringReplay, ol.render.canvas.Replay);
/**
@@ -1179,7 +1179,7 @@ ol.render.canvas.LineStringReplay.prototype.setFillStrokeStyle = function(fillSt
*/
ol.render.canvas.PolygonReplay = function(tolerance, maxExtent, resolution) {
goog.base(this, tolerance, maxExtent, resolution);
ol.render.canvas.Replay.call(this, tolerance, maxExtent, resolution);
/**
* @private
@@ -1216,7 +1216,7 @@ ol.render.canvas.PolygonReplay = function(tolerance, maxExtent, resolution) {
};
};
goog.inherits(ol.render.canvas.PolygonReplay, ol.render.canvas.Replay);
ol.inherits(ol.render.canvas.PolygonReplay, ol.render.canvas.Replay);
/**
@@ -1534,7 +1534,7 @@ ol.render.canvas.PolygonReplay.prototype.setFillStrokeStyles_ = function() {
*/
ol.render.canvas.TextReplay = function(tolerance, maxExtent, resolution) {
goog.base(this, tolerance, maxExtent, resolution);
ol.render.canvas.Replay.call(this, tolerance, maxExtent, resolution);
/**
* @private
@@ -1603,7 +1603,7 @@ ol.render.canvas.TextReplay = function(tolerance, maxExtent, resolution) {
this.textState_ = null;
};
goog.inherits(ol.render.canvas.TextReplay, ol.render.canvas.Replay);
ol.inherits(ol.render.canvas.TextReplay, ol.render.canvas.Replay);
/**

4
src/ol/render/renderevent.js
View File

@@ -42,7 +42,7 @@ ol.render.Event = function(
type, opt_target, opt_vectorContext, opt_frameState, opt_context,
opt_glContext) {
goog.base(this, type, opt_target);
ol.events.Event.call(this, type, opt_target);
/**
* For canvas, this is an instance of {@link ol.render.canvas.Immediate}.
@@ -75,4 +75,4 @@ ol.render.Event = function(
this.glContext = opt_glContext;
};
goog.inherits(ol.render.Event, ol.events.Event);
ol.inherits(ol.render.Event, ol.events.Event);

8
src/ol/render/webgl/webglimagedefaultshader.js
View File

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

4
src/ol/render/webgl/webglimmediate.js
View File

@@ -20,7 +20,7 @@ goog.require('ol.render.webgl.ReplayGroup');
* @struct
*/
ol.render.webgl.Immediate = function(context, center, resolution, rotation, size, extent, pixelRatio) {
goog.base(this);
ol.render.VectorContext.call(this);
/**
* @private
@@ -64,7 +64,7 @@ ol.render.webgl.Immediate = function(context, center, resolution, rotation, size
this.imageStyle_ = null;
};
goog.inherits(ol.render.webgl.Immediate, ol.render.VectorContext);
ol.inherits(ol.render.webgl.Immediate, ol.render.VectorContext);
/**

4
src/ol/render/webgl/webglreplay.js
View File

@@ -25,7 +25,7 @@ goog.require('ol.webgl.Context');
* @struct
*/
ol.render.webgl.ImageReplay = function(tolerance, maxExtent) {
goog.base(this);
ol.render.VectorContext.call(this);
/**
* @type {number|undefined}
@@ -207,7 +207,7 @@ ol.render.webgl.ImageReplay = function(tolerance, maxExtent) {
*/
this.width_ = undefined;
};
goog.inherits(ol.render.webgl.ImageReplay, ol.render.VectorContext);
ol.inherits(ol.render.webgl.ImageReplay, ol.render.VectorContext);
/**