Merge remote-tracking branch 'openlayers/master' into vector-api

This commit is contained in:
Tom Payne
2014-01-13 16:07:39 +01:00
9 changed files with 102 additions and 39 deletions

View File

@@ -90,15 +90,25 @@ ol.control.Logo.prototype.updateElement_ = function(frameState) {
}
}
var image, logoElement;
for (logo in logos) {
if (!(logo in logoElements)) {
var image, logoElement, logoKey;
for (logoKey in logos) {
if (!(logoKey in logoElements)) {
image = new Image();
image.src = logo;
logoElement = goog.dom.createElement(goog.dom.TagName.LI);
logoElement.appendChild(image);
image.src = logoKey;
var logoValue = logos[logoKey];
var child;
if (logoValue === '') {
child = image;
} else {
child = goog.dom.createDom(goog.dom.TagName.A, {
'href': logoValue,
'target': '_blank'
});
child.appendChild(image);
}
logoElement = goog.dom.createDom(goog.dom.TagName.LI, undefined, child);
goog.dom.appendChild(this.ulElement_, logoElement);
logoElements[logo] = logoElement;
logoElements[logoKey] = logoElement;
}
}