Merge branch 'master' of github.com:openlayers/openlayers into 3526

This commit is contained in:
tschaub
2011-10-11 09:42:49 -06:00
9 changed files with 43 additions and 19 deletions
+1 -1
View File
@@ -287,7 +287,7 @@ OpenLayers.Control.WMSGetFeatureInfo = OpenLayers.Class(OpenLayers.Control, {
var candidates = this.layers || this.map.layers;
var layers = [];
var layer, url;
for(var i=0, len=candidates.length; i<len; ++i) {
for(var i = candidates.length - 1; i >= 0; --i) {
layer = candidates[i];
if(layer instanceof OpenLayers.Layer.WMS &&
(!this.queryVisible || layer.getVisibility())) {
@@ -112,6 +112,9 @@ OpenLayers.Format.WMSCapabilities.v1 = OpenLayers.Class(
if (layer.formats === undefined) {
layer.formats = capability.request.getmap.formats;
}
if (layer.infoFormats === undefined && capability.request.getfeatureinfo) {
layer.infoFormats = capability.request.getfeatureinfo.formats;
}
var i, len;
+4 -4
View File
@@ -18,8 +18,8 @@
OpenLayers.Layer.PointTrack = OpenLayers.Class(OpenLayers.Layer.Vector, {
/**
* APIProperty:
* dataFrom - {<OpenLayers.Layer.PointTrack.TARGET_NODE>} or
* APIProperty: dataFrom
* {<OpenLayers.Layer.PointTrack.TARGET_NODE>} or
* {<OpenLayers.Layer.PointTrack.SOURCE_NODE>} optional. If the lines
* should get the data/attributes from one of the two points it is
* composed of, which one should it be?
@@ -27,8 +27,8 @@ OpenLayers.Layer.PointTrack = OpenLayers.Class(OpenLayers.Layer.Vector, {
dataFrom: null,
/**
* APIProperty:
* styleFrom - {<OpenLayers.Layer.PointTrack.TARGET_NODE>} or
* APIProperty: styleFrom
* {<OpenLayers.Layer.PointTrack.TARGET_NODE>} or
* {<OpenLayers.Layer.PointTrack.SOURCE_NODE>} optional. If the lines
* should get the style from one of the two points it is composed of,
* which one should it be?
+14
View File
@@ -346,6 +346,20 @@ OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile.BackBufferable, {
this.isLoading = false;
this.events.triggerEvent("loadend");
// IE<7 needs a reflow when the tiles are loaded because of the
// percentage based positioning. Otherwise nothing is shown
// until the user interacts with the map in some way.
if (parseFloat(navigator.appVersion.split("MSIE")[1]) < 7 &&
this.layer && this.layer.div) {
var span = document.createElement("span");
span.style.display = "none";
var layerDiv = this.layer.div;
layerDiv.appendChild(span);
window.setTimeout(function() {
span.parentNode === layerDiv && span.parentNode.removeChild(span);
}, 0);
}
if (this.layerAlphaHack === true) {
img.style.filter =
"progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" +