Pull up patches for the following bugs from trunk:
#385: building for windows users (fix license) #453: IE gives new DOM elements a parent with fragment node type #454: Fix tests which are breaking in Opera #455: Util.isEquivalentUrl broken in Opera #463: map.setBaseLayer is a bit funky #464: Overview Map dissappears when on permalinked page #465: allow controls to live outside viewport (for real) #466: HTMLDivElement is still undefined in IE7 (but OpenLayers.Util.alphaHack() is now false) #467: isEquivalentURL() not complete for IE #468: Overview MapLosing Rectangle #469: Default marker is incorrectly centered #470: Can not use "search" property IE7 #473: Remove call to checkImgURL #474: overview map isn't properly updated when the argparser kicks in git-svn-id: http://svn.openlayers.org/branches/openlayers/2.3@2181 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -133,7 +133,6 @@ OpenLayers.Control.OverviewMap.prototype =
|
||||
OpenLayers.Event.stop(e);
|
||||
});
|
||||
this.rectEvents = new OpenLayers.Events(this, this.extentRectangle);
|
||||
this.rectEvents.register('mouseover', this, this.rectMouseOver);
|
||||
this.rectEvents.register('mouseout', this, this.rectMouseOut);
|
||||
this.rectEvents.register('mousedown', this, this.rectMouseDown);
|
||||
this.rectEvents.register('mousemove', this, this.rectMouseMove);
|
||||
@@ -147,8 +146,7 @@ OpenLayers.Control.OverviewMap.prototype =
|
||||
|
||||
// Optionally add min/max buttons if the control will go in the
|
||||
// map viewport.
|
||||
if(!this.div.parentNode ||
|
||||
(this.div.parentNode.className == 'olMapViewport')) {
|
||||
if(!this.outsideViewport) {
|
||||
this.div.className = 'olControlOverviewMapContainer';
|
||||
var imgLocation = OpenLayers.Util.getImagesLocation();
|
||||
// maximize button div
|
||||
@@ -187,7 +185,9 @@ OpenLayers.Control.OverviewMap.prototype =
|
||||
// show the overview map
|
||||
this.element.style.display = '';
|
||||
}
|
||||
|
||||
if(this.map.getExtent()) {
|
||||
this.update();
|
||||
}
|
||||
return this.div;
|
||||
},
|
||||
|
||||
@@ -196,22 +196,24 @@ OpenLayers.Control.OverviewMap.prototype =
|
||||
this.map.events.unregister("changebaselayer", this, this.baseLayerDraw);
|
||||
},
|
||||
|
||||
/**
|
||||
* @param {OpenLayers.Event} evt
|
||||
*/
|
||||
rectMouseOver: function (evt) {
|
||||
this.extentRectangle.style.cursor = 'move';
|
||||
},
|
||||
|
||||
/**
|
||||
* @param {OpenLayers.Event} evt
|
||||
*/
|
||||
rectMouseOut: function (evt) {
|
||||
this.extentRectangle.style.cursor = 'default';
|
||||
if(this.rectDragStart != null) {
|
||||
if(this.performedRectDrag) {
|
||||
this.updateMapToRect();
|
||||
}
|
||||
this.rectMouseMove(evt);
|
||||
var rectPxBounds = this.getRectPxBounds();
|
||||
// if we're off of the overview map, update the main map
|
||||
// otherwise, keep moving the rect
|
||||
if((rectPxBounds.top <= 0) || (rectPxBounds.left <= 0) ||
|
||||
(rectPxBounds.bottom >= this.size.h - this.hComp) ||
|
||||
(rectPxBounds.right >= this.size.w - this.wComp)) {
|
||||
this.updateMapToRect();
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
document.onselectstart = null;
|
||||
this.rectDragStart = null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user