From adbd2405caad2abf83b1cf626df2156ab465d1b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Sun, 3 Apr 2011 12:47:14 +0000 Subject: [PATCH] mouseout callbacks should check if the mouse leaves map.eventsDiv instead of map.div or map.viewPortDiv, p=jorix, r=me (closes #3239) git-svn-id: http://svn.openlayers.org/trunk/openlayers@11861 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- lib/OpenLayers/Control/MouseDefaults.js | 2 +- lib/OpenLayers/Control/MouseToolbar.js | 2 +- lib/OpenLayers/Handler/Drag.js | 2 +- lib/OpenLayers/Handler/Hover.js | 2 +- lib/OpenLayers/Handler/Point.js | 2 +- tests/Handler/Drag.html | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/OpenLayers/Control/MouseDefaults.js b/lib/OpenLayers/Control/MouseDefaults.js index 4c66b2abb1..cc71164b4a 100644 --- a/lib/OpenLayers/Control/MouseDefaults.js +++ b/lib/OpenLayers/Control/MouseDefaults.js @@ -238,7 +238,7 @@ OpenLayers.Control.MouseDefaults = OpenLayers.Class(OpenLayers.Control, { */ defaultMouseOut: function (evt) { if (this.mouseDragStart != null && - OpenLayers.Util.mouseLeft(evt, this.map.div)) { + OpenLayers.Util.mouseLeft(evt, this.map.eventsDiv)) { if (this.zoomBox) { this.removeZoomBox(); } diff --git a/lib/OpenLayers/Control/MouseToolbar.js b/lib/OpenLayers/Control/MouseToolbar.js index e928b21e83..9400c1791a 100644 --- a/lib/OpenLayers/Control/MouseToolbar.js +++ b/lib/OpenLayers/Control/MouseToolbar.js @@ -374,7 +374,7 @@ OpenLayers.Control.MouseToolbar = OpenLayers.Class( */ defaultMouseOut: function (evt) { if (this.mouseDragStart != null - && OpenLayers.Util.mouseLeft(evt, this.map.div)) { + && OpenLayers.Util.mouseLeft(evt, this.map.eventsDiv)) { if (this.zoomBox) { this.removeZoomBox(); if (this.startViaKeyboard) { diff --git a/lib/OpenLayers/Handler/Drag.js b/lib/OpenLayers/Handler/Drag.js index 36291edf98..9082d9c682 100644 --- a/lib/OpenLayers/Handler/Drag.js +++ b/lib/OpenLayers/Handler/Drag.js @@ -442,7 +442,7 @@ OpenLayers.Handler.Drag = OpenLayers.Class(OpenLayers.Handler, { * {Boolean} Let the event propagate. */ mouseout: function (evt) { - if (this.started && OpenLayers.Util.mouseLeft(evt, this.map.viewPortDiv)) { + if (this.started && OpenLayers.Util.mouseLeft(evt, this.map.eventsDiv)) { if(this.documentDrag === true) { this.addDocumentEvents(); } else { diff --git a/lib/OpenLayers/Handler/Hover.js b/lib/OpenLayers/Handler/Hover.js index d681be822b..a508cbd16f 100644 --- a/lib/OpenLayers/Handler/Hover.js +++ b/lib/OpenLayers/Handler/Hover.js @@ -110,7 +110,7 @@ OpenLayers.Handler.Hover = OpenLayers.Class(OpenLayers.Handler, { * {Boolean} Continue propagating this event. */ mouseout: function(evt) { - if (OpenLayers.Util.mouseLeft(evt, this.map.div)) { + if (OpenLayers.Util.mouseLeft(evt, this.map.eventsDiv)) { this.clearTimer(); this.callback('move', [evt]); } diff --git a/lib/OpenLayers/Handler/Point.js b/lib/OpenLayers/Handler/Point.js index a3c9d72460..9155f02cf5 100644 --- a/lib/OpenLayers/Handler/Point.js +++ b/lib/OpenLayers/Handler/Point.js @@ -563,7 +563,7 @@ OpenLayers.Handler.Point = OpenLayers.Class(OpenLayers.Handler, { * evt - {Event} The browser event */ mouseout: function(evt) { - if(OpenLayers.Util.mouseLeft(evt, this.map.viewPortDiv)) { + if(OpenLayers.Util.mouseLeft(evt, this.map.eventsDiv)) { this.stoppedDown = this.stopDown; this.mouseDown = false; } diff --git a/tests/Handler/Drag.html b/tests/Handler/Drag.html index 4be1df9e6d..533e1bb647 100644 --- a/tests/Handler/Drag.html +++ b/tests/Handler/Drag.html @@ -252,7 +252,7 @@ t.ok(evt.xy.x == testEvents.done.xy.x && evt.xy.y == testEvents.done.xy.y, "mouseout calls Util.mouseLeft with the correct event"); - t.eq(element.id, map.viewPortDiv.id, + t.eq(element.id, map.eventsDiv.id, "mouseout calls Util.mouseLeft with the correct element"); return true; }