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

Remove goog.dom

Browse Source
This commit is contained in:
nicholas
2016-03-26 23:13:10 +13:00
committed by Nicholas L
parent 29c8af7559
commit 6b465902cd
37 changed files with 446 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/canvas/canvasmaprenderer.js
+1 -2
View File
@@ -3,7 +3,6 @@
goog.provide('ol.renderer.canvas.Map');
goog.require('goog.asserts');
goog.require('goog.dom');
goog.require('goog.vec.Mat4');
goog.require('ol');
goog.require('ol.RendererType');
@@ -54,7 +53,7 @@ ol.renderer.canvas.Map = function(container, map) {
this.canvas_.style.width = '100%';
this.canvas_.style.height = '100%';
this.canvas_.className = ol.css.CLASS_UNSELECTABLE;
goog.dom.insertChildAt(container, this.canvas_, 0);
container.insertBefore(this.canvas_, container.childNodes[0] || null);
/**
* @private
src/ol/renderer/dom/domimagelayerrenderer.js
+2 -3
View File
@@ -1,7 +1,6 @@
goog.provide('ol.renderer.dom.ImageLayer');
goog.require('goog.asserts');
goog.require('goog.dom');
goog.require('goog.vec.Mat4');
goog.require('ol.ImageBase');
goog.require('ol.ViewHint');
@@ -66,7 +65,7 @@ ol.renderer.dom.ImageLayer.prototype.forEachFeatureAtCoordinate = function(coord
* @inheritDoc
*/
ol.renderer.dom.ImageLayer.prototype.clearFrame = function() {
goog.dom.removeChildren(this.target);
ol.dom.removeChildren(this.target);
this.image_ = null;
};
@@ -133,7 +132,7 @@ ol.renderer.dom.ImageLayer.prototype.prepareFrame = function(frameState, layerSt
// overriding the max-width style.
imageElement.style.maxWidth = 'none';
imageElement.style.position = 'absolute';
goog.dom.removeChildren(this.target);
ol.dom.removeChildren(this.target);
this.target.appendChild(imageElement);
this.image_ = image;
}
src/ol/renderer/dom/dommaprenderer.js
+5 -6
View File
@@ -1,7 +1,6 @@
goog.provide('ol.renderer.dom.Map');
goog.require('goog.asserts');
goog.require('goog.dom');
goog.require('ol.events');
goog.require('ol.events.Event');
goog.require('ol.events.EventType');
@@ -47,7 +46,7 @@ ol.renderer.dom.Map = function(container, map) {
canvas.style.width = '100%';
canvas.style.height = '100%';
canvas.className = ol.css.CLASS_UNSELECTABLE;
goog.dom.insertChildAt(container, canvas, 0);
container.insertBefore(canvas, container.childNodes[0] || null);
/**
* @private
@@ -70,7 +69,7 @@ ol.renderer.dom.Map = function(container, map) {
ol.events.listen(this.layersPane_, ol.events.EventType.TOUCHSTART,
ol.events.Event.preventDefault);
goog.dom.insertChildAt(container, this.layersPane_, 0);
container.insertBefore(this.layersPane_, container.childNodes[0] || null);
/**
* @private
@@ -86,7 +85,7 @@ ol.inherits(ol.renderer.dom.Map, ol.renderer.Map);
* @inheritDoc
*/
ol.renderer.dom.Map.prototype.disposeInternal = function() {
goog.dom.removeNode(this.layersPane_);
ol.dom.removeNode(this.layersPane_);
ol.renderer.Map.prototype.disposeInternal.call(this);
};
@@ -185,7 +184,7 @@ ol.renderer.dom.Map.prototype.renderFrame = function(frameState) {
this.getLayerRenderer(layer));
goog.asserts.assertInstanceof(layerRenderer, ol.renderer.dom.Layer,
'renderer is an instance of ol.renderer.dom.Layer');
goog.dom.insertChildAt(this.layersPane_, layerRenderer.getTarget(), i);
this.layersPane_.insertBefore(layerRenderer.getTarget(), this.layersPane_.childNodes[i] || null);
if (ol.layer.Layer.visibleAtResolution(layerState, viewResolution) &&
layerState.sourceState == ol.source.State.READY) {
if (layerRenderer.prepareFrame(frameState, layerState)) {
@@ -203,7 +202,7 @@ ol.renderer.dom.Map.prototype.renderFrame = function(frameState) {
layerRenderer = this.getLayerRendererByKey(layerKey);
goog.asserts.assertInstanceof(layerRenderer, ol.renderer.dom.Layer,
'renderer is an instance of ol.renderer.dom.Layer');
goog.dom.removeNode(layerRenderer.getTarget());
ol.dom.removeNode(layerRenderer.getTarget());
}
}
src/ol/renderer/dom/domtilelayerrenderer.js
+8 -8
View File
@@ -4,7 +4,6 @@
goog.provide('ol.renderer.dom.TileLayer');
goog.require('goog.asserts');
goog.require('goog.dom');
goog.require('goog.vec.Mat4');
goog.require('ol');
goog.require('ol.TileRange');
@@ -64,7 +63,7 @@ ol.inherits(ol.renderer.dom.TileLayer, ol.renderer.dom.Layer);
* @inheritDoc
*/
ol.renderer.dom.TileLayer.prototype.clearFrame = function() {
goog.dom.removeChildren(this.target);
ol.dom.removeChildren(this.target);
this.renderedRevision_ = 0;
};
@@ -164,7 +163,7 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame = function(frameState, layerSta
if (this.renderedRevision_ != tileSource.getRevision()) {
for (tileLayerZKey in this.tileLayerZs_) {
tileLayerZ = this.tileLayerZs_[+tileLayerZKey];
goog.dom.removeNode(tileLayerZ.target);
ol.dom.removeNode(tileLayerZ.target);
}
this.tileLayerZs_ = {};
this.renderedRevision_ = tileSource.getRevision();
@@ -206,7 +205,7 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame = function(frameState, layerSta
tileLayerZKey = tileLayerZKeys[i];
tileLayerZ = this.tileLayerZs_[tileLayerZKey];
if (!(tileLayerZKey in tilesToDrawByZ)) {
goog.dom.removeNode(tileLayerZ.target);
ol.dom.removeNode(tileLayerZ.target);
delete this.tileLayerZs_[tileLayerZKey];
continue;
}
@@ -223,13 +222,14 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame = function(frameState, layerSta
if (tileLayerZKey in newTileLayerZKeys) {
for (j = tileLayerZKey - 1; j >= 0; --j) {
if (j in this.tileLayerZs_) {
goog.dom.insertSiblingAfter(
tileLayerZ.target, this.tileLayerZs_[j].target);
if (this.tileLayerZs_[j].target.parentNode) {
this.tileLayerZs_[j].target.parentNode.insertBefore(tileLayerZ.target, this.tileLayerZs_[j].target.nextSibling);
}
break;
}
}
if (j < 0) {
goog.dom.insertChildAt(this.target, tileLayerZ.target, 0);
this.target.insertBefore(tileLayerZ.target, this.target.childNodes[0] || null);
}
} else {
if (!frameState.viewHints[ol.ViewHint.ANIMATING] &&
@@ -430,7 +430,7 @@ ol.renderer.dom.TileLayerZ_.prototype.removeTilesOutsideExtent = function(extent
for (i = 0, ii = tilesToRemove.length; i < ii; ++i) {
tile = tilesToRemove[i];
tileCoordKey = tile.tileCoord.toString();
goog.dom.removeNode(tile.getImage(this));
ol.dom.removeNode(tile.getImage(this));
delete this.tiles_[tileCoordKey];
}
};
src/ol/renderer/webgl/webglmaprenderer.js
+1 -2
View File
@@ -3,7 +3,6 @@
goog.provide('ol.renderer.webgl.Map');
goog.require('goog.asserts');
goog.require('goog.dom');
goog.require('goog.webgl');
goog.require('ol');
goog.require('ol.RendererType');
@@ -51,7 +50,7 @@ ol.renderer.webgl.Map = function(container, map) {
this.canvas_.style.width = '100%';
this.canvas_.style.height = '100%';
this.canvas_.className = ol.css.CLASS_UNSELECTABLE;
goog.dom.insertChildAt(container, this.canvas_, 0);
container.insertBefore(this.canvas_, container.childNodes[0] || null);
/**
* @private