From 55be96a9dc33ca682af1f4d83d672cc1d5dfdb34 Mon Sep 17 00:00:00 2001 From: pgiraud Date: Thu, 28 Apr 2011 07:09:01 +0000 Subject: [PATCH] Don't put the box under the cursor until the mouse moved, prevent errors with the GetFeature and click events. I also removed the no longer valid (and failing) tests. r=elemoine, (Closes #2993) git-svn-id: http://svn.openlayers.org/trunk/openlayers@11923 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- lib/OpenLayers/Handler/Box.js | 5 ----- tests/Handler/Box.html | 8 ++------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/lib/OpenLayers/Handler/Box.js b/lib/OpenLayers/Handler/Box.js index 9f5cd97f6d..caa07dfb05 100644 --- a/lib/OpenLayers/Handler/Box.js +++ b/lib/OpenLayers/Handler/Box.js @@ -99,11 +99,6 @@ OpenLayers.Handler.Box = OpenLayers.Class(OpenLayers.Handler, { this.map.eventsDiv.appendChild(this.zoomBox); - var offset = this.getBoxOffsets(); - var pos = this.dragHandler.start; - this.zoomBox.style.left = (pos.x - offset.left) + "px"; - this.zoomBox.style.top = (pos.y - offset.top) + "px"; - OpenLayers.Element.addClass( this.map.eventsDiv, "olDrawBox" ); diff --git a/tests/Handler/Box.html b/tests/Handler/Box.html index 85bb52f626..950ea7021a 100644 --- a/tests/Handler/Box.html +++ b/tests/Handler/Box.html @@ -39,7 +39,7 @@ map.div.removeChild(testdiv); var testAll = !isNaN(left); - t.plan(testAll ? 12 : 2); + t.plan(testAll ? 10 : 2); // we change NaN values to 0 values in the handler's // boxOffsets object, this is to prevent "invalid @@ -58,14 +58,10 @@ handler.dragHandler.start = {x: 5, y: 5}; handler.startBox(); offset = handler.getBoxOffsets(); + handler.moveBox({x: 10, y: 10}); if (testAll) { t.eq(parseInt(handler.zoomBox.style.left), 5 - offset.left, "x position of box correct"); t.eq(parseInt(handler.zoomBox.style.top), 5 - offset.top, "y position of box correct"); - } - handler.moveBox({x: 10, y: 10}); - if (testAll) { - t.eq(parseInt(handler.zoomBox.style.left), 5 - offset.left, "x position of box still correct"); - t.eq(parseInt(handler.zoomBox.style.top), 5 - offset.top, "y position of box still correct"); t.eq(parseInt(handler.zoomBox.style.width), 5 + offset.width + 1, "x dimension of box correct"); t.eq(parseInt(handler.zoomBox.style.height), 5 + offset.height + 1, "y dimension of box correct"); }