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

Use setElementShown instead of showElement

Browse Source
This commit is contained in:
Tom Payne
2013-07-22 17:09:54 +02:00
parent 0467222e46
commit 46d16ba0ca
8 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ol/control/attributioncontrol.js
View File

@@ -126,7 +126,7 @@ ol.control.Attribution.prototype.updateElement_ = function(frameState) {
if (goog.isNull(frameState)) {
if (this.renderedVisible_) {
goog.style.showElement(this.element, false);
goog.style.setElementShown(this.element, false);
this.renderedVisible_ = false;
}
return;
@@ -142,14 +142,15 @@ ol.control.Attribution.prototype.updateElement_ = function(frameState) {
for (attributionKey in this.attributionElements_) {
if (attributionKey in visibleAttributions) {
if (!this.attributionElementRenderedVisible_[attributionKey]) {
goog.style.showElement(this.attributionElements_[attributionKey], true);
goog.style.setElementShown(
this.attributionElements_[attributionKey], true);
this.attributionElementRenderedVisible_[attributionKey] = true;
}
delete visibleAttributions[attributionKey];
}
else if (attributionKey in hiddenAttributions) {
if (this.attributionElementRenderedVisible_[attributionKey]) {
goog.style.showElement(
goog.style.setElementShown(
this.attributionElements_[attributionKey], false);
delete this.attributionElementRenderedVisible_[attributionKey];
}
@@ -173,7 +174,7 @@ ol.control.Attribution.prototype.updateElement_ = function(frameState) {
attributionElement = goog.dom.createElement(goog.dom.TagName.LI);
attributionElement.innerHTML =
hiddenAttributions[attributionKey].getHTML();
goog.style.showElement(attributionElement, false);
goog.style.setElementShown(attributionElement, false);
goog.dom.appendChild(this.ulElement_, attributionElement);
this.attributionElements_[attributionKey] = attributionElement;
}
@@ -181,7 +182,7 @@ ol.control.Attribution.prototype.updateElement_ = function(frameState) {
var renderVisible =
!goog.object.isEmpty(this.attributionElementRenderedVisible_);
if (this.renderedVisible_ != renderVisible) {
goog.style.showElement(this.element, renderVisible);
goog.style.setElementShown(this.element, renderVisible);
this.renderedVisible_ = renderVisible;
}

4
src/ol/control/logocontrol.js
View File

@@ -73,7 +73,7 @@ ol.control.Logo.prototype.updateElement_ = function(frameState) {
if (goog.isNull(frameState)) {
if (this.renderedVisible_) {
goog.style.showElement(this.element, false);
goog.style.setElementShown(this.element, false);
this.renderedVisible_ = false;
}
return;
@@ -104,7 +104,7 @@ ol.control.Logo.prototype.updateElement_ = function(frameState) {
var renderVisible = !goog.object.isEmpty(logos);
if (this.renderedVisible_ != renderVisible) {
goog.style.showElement(this.element, renderVisible);
goog.style.setElementShown(this.element, renderVisible);
this.renderedVisible_ = renderVisible;
}

4
src/ol/control/scalelinecontrol.js
View File

@@ -194,7 +194,7 @@ ol.control.ScaleLine.prototype.updateElement_ = function() {
if (goog.isNull(view2DState)) {
if (this.renderedVisible_) {
goog.style.showElement(this.element_, false);
goog.style.setElementShown(this.element_, false);
this.renderedVisible_ = false;
}
return;
@@ -322,7 +322,7 @@ ol.control.ScaleLine.prototype.updateElement_ = function() {
}
if (!this.renderedVisible_) {
goog.style.showElement(this.element_, true);
goog.style.setElementShown(this.element_, true);
this.renderedVisible_ = true;
}

4
src/ol/overlay.js
View File

@@ -280,7 +280,7 @@ ol.Overlay.prototype.updatePixelPosition_ = function() {
var position = this.getPosition();
if (!goog.isDef(map) || !map.isDef() || !goog.isDef(position)) {
if (this.rendered_.visible) {
goog.style.showElement(this.element_, false);
goog.style.setElementShown(this.element_, false);
this.rendered_.visible = false;
}
return;
@@ -329,7 +329,7 @@ ol.Overlay.prototype.updatePixelPosition_ = function() {
}
if (!this.rendered_.visible) {
goog.style.showElement(this.element_, true);
goog.style.setElementShown(this.element_, true);
this.rendered_.visible = true;
}

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

@@ -94,7 +94,7 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
if (goog.isNull(frameState)) {
if (this.renderedVisible_) {
goog.style.showElement(this.canvas_, false);
goog.style.setElementShown(this.canvas_, false);
this.renderedVisible_ = false;
}
return;
@@ -156,7 +156,7 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
}
if (!this.renderedVisible_) {
goog.style.showElement(this.canvas_, true);
goog.style.setElementShown(this.canvas_, true);
this.renderedVisible_ = true;
}

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

@@ -71,7 +71,7 @@ ol.renderer.dom.Map.prototype.renderFrame = function(frameState) {
if (goog.isNull(frameState)) {
if (this.renderedVisible_) {
goog.style.showElement(this.layersPane_, false);
goog.style.setElementShown(this.layersPane_, false);
this.renderedVisible_ = false;
}
return;
@@ -98,7 +98,7 @@ ol.renderer.dom.Map.prototype.renderFrame = function(frameState) {
}
if (!this.renderedVisible_) {
goog.style.showElement(this.layersPane_, true);
goog.style.setElementShown(this.layersPane_, true);
this.renderedVisible_ = true;
}

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

@@ -76,7 +76,7 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
if (!layerState.visible) {
if (this.renderedVisible_) {
goog.style.showElement(this.target, false);
goog.style.setElementShown(this.target, false);
this.renderedVisible_ = false;
}
return;
@@ -226,7 +226,7 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
}
if (layerState.visible && !this.renderedVisible_) {
goog.style.showElement(this.target, true);
goog.style.setElementShown(this.target, true);
this.renderedVisible_ = true;
}

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

@@ -538,7 +538,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
if (goog.isNull(frameState)) {
if (this.renderedVisible_) {
goog.style.showElement(this.canvas_, false);
goog.style.setElementShown(this.canvas_, false);
this.renderedVisible_ = false;
}
return false;
@@ -651,7 +651,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
}
if (!this.renderedVisible_) {
goog.style.showElement(this.canvas_, true);
goog.style.setElementShown(this.canvas_, true);
this.renderedVisible_ = true;
}