diff --git a/lib/OpenLayers/Events.js b/lib/OpenLayers/Events.js index 48aaeae7eb..d9715eba7e 100644 --- a/lib/OpenLayers/Events.js +++ b/lib/OpenLayers/Events.js @@ -376,14 +376,6 @@ OpenLayers.Event = { /* prevent memory leaks in IE */ OpenLayers.Event.observe(window, 'unload', OpenLayers.Event.unloadCache, false); -// FIXME: Remove this in 3.0. In 3.0, Event.stop will no longer be provided -// by OpenLayers. -if (window.Event) { - OpenLayers.Util.applyDefaults(window.Event, OpenLayers.Event); -} else { - var Event = OpenLayers.Event; -} - /** * Class: OpenLayers.Events */ diff --git a/lib/deprecated.js b/lib/deprecated.js index 93bc3b5e81..266dffbeb5 100644 --- a/lib/deprecated.js +++ b/lib/deprecated.js @@ -1041,6 +1041,14 @@ if (!Function.prototype.bindAsEventListener) { }; } +// FIXME: Remove this in 3.0. In 3.0, Event.stop will no longer be provided +// by OpenLayers. +if (window.Event) { + OpenLayers.Util.applyDefaults(window.Event, OpenLayers.Event); +} else { + var Event = OpenLayers.Event; +} + /** * Class: OpenLayers.Control.MouseDefaults * This class is DEPRECATED in 2.4 and will be removed by 3.0. diff --git a/tests/Events.html b/tests/Events.html index 185ba0f351..e15e8488ff 100644 --- a/tests/Events.html +++ b/tests/Events.html @@ -409,13 +409,6 @@ } - /** HACK HACK HACK Deprecated This test should be removed in 3.0 **/ - function test_Events_globalEventObject(t) { - t.plan(1); - t.ok(Event.stop, "a stop() function exists on the global JS Event object, if indeed it exists. This is legacy deprecated and will be gone in 3.0"); - } - -