From eaaa09e7a02f2a93fff7ac8ae345a4b394db424f Mon Sep 17 00:00:00 2001
From: Andrew Dupont <prototype@andrewdupont.net>
Date: Thu, 24 Apr 2008 14:04:55 -0500
Subject: [PATCH] Fix error when calling Event.stopObserving(window).
 (jddalton) [#30 state:resolved]

(cherry picked from commit b94db72961fd11ed518758e284f7ab6584fd5187)
---
 CHANGELOG               | 2 ++
 src/event.js            | 6 +++---
 test/unit/event_test.js | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e9679f043..afcba44d0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+* Fix error when calling Event.stopObserving(window). (jddalton) [#30 state:resolved]
+
 * Fix an issue with calling Event.pointer before the DOM is loaded. (kangax, jddalton) [#4 state:resolved]
 
 * Refactor unit tests. Unit tests are now dynamically generated from a JavaScript test file and optional HTML, JS and CSS fixtures. [Tobie Langel]
diff --git a/src/event.js b/src/event.js
index bedd1b634..9030b297c 100644
--- a/src/event.js
+++ b/src/event.js
@@ -270,13 +270,13 @@ Object.extend(Event, (function() {
       
       if (!handler && eventName) {
         getWrappersForEventName(id, eventName).each(function(wrapper) {
-          element.stopObserving(eventName, wrapper.handler);
+          Event.stopObserving(element, eventName, wrapper.handler);
         });
         return element;
         
       } else if (!eventName) {
-        Object.keys(getCacheForID(id)).each(function(eventName) {
-          element.stopObserving(eventName);
+        Object.keys(getCacheForID(id)).without("element").each(function(eventName) {
+          Event.stopObserving(element, eventName);
         });
         return element;
       }
diff --git a/test/unit/event_test.js b/test/unit/event_test.js
index a0ab793b3..2b2a3c043 100644
--- a/test/unit/event_test.js
+++ b/test/unit/event_test.js
@@ -120,6 +120,8 @@ new Test.Unit.Runner({
     this.assertEqual(0, count);
     span.fire("test:somethingElseHappened");
     this.assertEqual(0, count);
+
+    this.assertEqual(window, Event.stopObserving(window));
   },
   
   testStopObservingWithoutHandlerArgument: function() {