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

Merge pull request #665 from twpayne/fix-firefox-dom-renderer

Browse Source 
Prevent Bootstrap's setting of max-width from infecting map
This commit is contained in:
Tom Payne
2013-04-30 06:46:41 -07:00
parent 2d83003b64 daa975d01f
commit 59a4155651
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,6 +104,10 @@ ol.renderer.dom.ImageLayer.prototype.renderFrame =
0); 0);
if (image != this.image_) { if (image != this.image_) {
var imageElement = image.getImageElement(this); var imageElement = image.getImageElement(this);
// Bootstrap sets the style max-width: 100% for all images, which breaks
// prevents the image from being displayed in FireFox. Workaround by
// overriding the max-width style.
imageElement.style.maxWidth = 'none';
imageElement.style.position = 'absolute'; imageElement.style.position = 'absolute';
goog.dom.removeChildren(this.target); goog.dom.removeChildren(this.target);
goog.dom.appendChild(this.target, imageElement); goog.dom.appendChild(this.target, imageElement);

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

@@ -315,6 +315,10 @@ ol.renderer.dom.TileLayerZ_.prototype.addTile = function(tile) {
var tileSize = this.tileGrid_.getTileSize(tileCoord.z); var tileSize = this.tileGrid_.getTileSize(tileCoord.z);
var image = tile.getImage(this); var image = tile.getImage(this);
var style = image.style; var style = image.style;
// Bootstrap sets the style max-width: 100% for all images, which breaks
// prevents the tile from being displayed in FireFox. Workaround by
// overriding the max-width style.
style.maxWidth = 'none';
style.position = 'absolute'; style.position = 'absolute';
style.left = style.left =
((tileCoord.x - this.tileCoordOrigin_.x) * tileSize.width) + 'px'; ((tileCoord.x - this.tileCoordOrigin_.x) * tileSize.width) + 'px';