Pulled up r679:r684 from trunk for the IE performance and bug fixes.

git-svn-id: http://svn.openlayers.org/branches/openlayers/1.0@685 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Schuyler Erle
2006-06-22 19:28:31 +00:00
parent 83197dc4f2
commit 24b58b5e0b
6 changed files with 24 additions and 12 deletions

View File

@@ -55,6 +55,7 @@ OpenLayers.Control.MouseDefaults.prototype =
this.zoomBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1;
this.map.viewPortDiv.appendChild(this.zoomBox);
}
document.onselectstart=function() { return false; }
Event.stop(evt);
},
@@ -111,6 +112,7 @@ OpenLayers.Control.MouseDefaults.prototype =
} else {
this.map.setCenter(this.map.center);
}
document.onselectstart=null;
this.mouseDragStart = null;
this.map.div.style.cursor = "default";
},

View File

@@ -164,6 +164,7 @@ OpenLayers.Control.MouseToolbar.prototype =
this.map.div.style.cursor = "move";
break;
}
document.onselectstart = function() { return false; }
Event.stop(evt);
},
@@ -247,6 +248,7 @@ OpenLayers.Control.MouseToolbar.prototype =
this.map.setCenter(this.map.center);
}
document.onselectstart = null;
this.mouseDragStart = null;
this.map.div.style.cursor = "default";
},

View File

@@ -146,7 +146,7 @@ OpenLayers.Layer.Grid.prototype = Object.extend( new OpenLayers.Layer(), {
new OpenLayers.Pixel(tileoffsetx - parseInt(this.map.layerContainerDiv.style.left),
tileoffsety - parseInt(this.map.layerContainerDiv.style.top))
);
tile.draw();
tile.draw((this.params.TRANSPARENT == 'true'));
row.append(tile);
tileoffsetlon += tilelon;
@@ -181,7 +181,7 @@ OpenLayers.Layer.Grid.prototype = Object.extend( new OpenLayers.Layer(), {
bounds.top = bounds.top + deltaLat;
position.y = position.y + deltaY;
var newTile = this.addTile(bounds, position);
newTile.draw();
newTile.draw((this.params.TRANSPARENT == 'true'));
newRow.append(newTile);
}
@@ -215,7 +215,7 @@ OpenLayers.Layer.Grid.prototype = Object.extend( new OpenLayers.Layer(), {
bounds.right = bounds.right + deltaLon;
position.x = position.x + deltaX;
var newTile = this.addTile(bounds, position);
newTile.draw();
newTile.draw((this.params.TRANSPARENT == 'true'));
if (prepend) {
row = row.prepend(newTile);

View File

@@ -47,7 +47,7 @@ OpenLayers.Layer.WMS.prototype =
* @type Boolean
*/
isBaseLayer: function() {
return (this.params.TRANSPARENT != true);
return (this.params.TRANSPARENT != 'true');
},
/**

View File

@@ -35,12 +35,20 @@ OpenLayers.Tile.Image.prototype =
/**
*/
draw:function() {
this.imgDiv = OpenLayers.Util.createAlphaImageDiv(null,
this.position,
this.size,
this.url,
"absolute");
draw:function(transparent) {
if (transparent) {
this.imgDiv = OpenLayers.Util.createAlphaImageDiv(null,
this.position,
this.size,
this.url,
"absolute");
} else {
this.imgDiv = OpenLayers.Util.createImage(null,
this.position,
this.size,
this.url,
"absolute");
}
this.layer.div.appendChild(this.imgDiv);
},