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

fix issue where we try to createblocks without a proper this.relativePosition. Robustness++. (Pullup #1479)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@6800 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
euzuro
2008-04-07 04:09:46 +00:00
parent 1b269f06f8
commit e84f3d6181
1 changed files with 49 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Popup/Framed.js
+49 -50
View File
@@ -248,15 +248,18 @@ OpenLayers.Popup.Framed =
* Method: createBlocks * Method: createBlocks
*/ */
createBlocks: function() { createBlocks: function() {
if (!this.relativePosition) {
// this.relativePosition can't be set until we have a map
// set: if it's not set, we can't create blocks. (See #1479)
return false;
}
this.blocks = []; this.blocks = [];
var position = this.positionBlocks[this.relativePosition]; //since all positions contain the same number of blocks, we can
// just pick the first position and use its blocks array to create
// our blocks array
var firstPosition = null;
for(var key in this.positionBlocks) {
firstPosition = key;
break;
}
var position = this.positionBlocks[firstPosition];
for (var i = 0; i < position.blocks.length; i++) { for (var i = 0; i < position.blocks.length; i++) {
var block = {}; var block = {};
@@ -280,8 +283,6 @@ OpenLayers.Popup.Framed =
block.div.appendChild(block.image); block.div.appendChild(block.image);
this.groupDiv.appendChild(block.div); this.groupDiv.appendChild(block.div);
} }
return true;
}, },
/** /**
@@ -292,50 +293,48 @@ OpenLayers.Popup.Framed =
*/ */
updateBlocks: function() { updateBlocks: function() {
if (!this.blocks) { if (!this.blocks) {
var cont = this.createBlocks(); this.createBlocks();
if (!cont) {
return false;
}
} }
if (this.relativePosition) {
var position = this.positionBlocks[this.relativePosition]; var position = this.positionBlocks[this.relativePosition];
for (var i = 0; i < position.blocks.length; i++) { for (var i = 0; i < position.blocks.length; i++) {
var positionBlock = position.blocks[i]; var positionBlock = position.blocks[i];
var block = this.blocks[i]; var block = this.blocks[i];
// adjust sizes // adjust sizes
var l = positionBlock.anchor.left; var l = positionBlock.anchor.left;
var b = positionBlock.anchor.bottom; var b = positionBlock.anchor.bottom;
var r = positionBlock.anchor.right; var r = positionBlock.anchor.right;
var t = positionBlock.anchor.top; var t = positionBlock.anchor.top;
//note that we use the isNaN() test here because if the //note that we use the isNaN() test here because if the
// size object is initialized with a "auto" parameter, the // size object is initialized with a "auto" parameter, the
// size constructor calls parseFloat() on the string, // size constructor calls parseFloat() on the string,
// which will turn it into NaN // which will turn it into NaN
// //
var w = (isNaN(positionBlock.size.w)) ? this.size.w - (r + l) var w = (isNaN(positionBlock.size.w)) ? this.size.w - (r + l)
: positionBlock.size.w; : positionBlock.size.w;
var h = (isNaN(positionBlock.size.h)) ? this.size.h - (b + t) var h = (isNaN(positionBlock.size.h)) ? this.size.h - (b + t)
: positionBlock.size.h; : positionBlock.size.h;
block.div.style.width = w + 'px'; block.div.style.width = w + 'px';
block.div.style.height = h + 'px'; block.div.style.height = h + 'px';
block.div.style.left = (l != null) ? l + 'px' : ''; block.div.style.left = (l != null) ? l + 'px' : '';
block.div.style.bottom = (b != null) ? b + 'px' : ''; block.div.style.bottom = (b != null) ? b + 'px' : '';
block.div.style.right = (r != null) ? r + 'px' : ''; block.div.style.right = (r != null) ? r + 'px' : '';
block.div.style.top = (t != null) ? t + 'px' : ''; block.div.style.top = (t != null) ? t + 'px' : '';
block.image.style.left = positionBlock.position.x + 'px'; block.image.style.left = positionBlock.position.x + 'px';
block.image.style.top = positionBlock.position.y + 'px'; block.image.style.top = positionBlock.position.y + 'px';
}
this.contentDiv.style.left = this.padding.left + "px";
this.contentDiv.style.top = this.padding.top + "px";
} }
this.contentDiv.style.left = this.padding.left + "px";
this.contentDiv.style.top = this.padding.top + "px";
}, },
CLASS_NAME: "OpenLayers.Popup.Framed" CLASS_NAME: "OpenLayers.Popup.Framed"