Changeset 7269 for spinoffs/prototype/branches/1-6-0-events

Timestamp:

08/04/07 07:13:34 (1 year ago)

Author:

sam

Message:

prototype: Make the eventName and handler arguments to Event.stopObserving optional. If no handler is specified, all handlers for the given event are unregistered. If no event name is specified, all observed events on the element are unregistered.

Files:

• spinoffs/prototype/branches/1-6-0-events/CHANGELOG (modified) (1 diff)
• spinoffs/prototype/branches/1-6-0-events/src/event.js (modified) (2 diffs)
• spinoffs/prototype/branches/1-6-0-events/test/unit/event.html (modified) (1 diff)

spinoffs/prototype/branches/1-6-0-events/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make the eventName and handler arguments to Event.stopObserving optional.  If no handler is specified, all handlers for the given event are unregistered.  If no event name is specified, all observed events on the element are unregistered.  [sam]
-
-* Add cross-support for the DOMContentLoaded event through a Prototype custom event on document called "contentloaded".  The DOMContentLoaded event fires before window.load, when the entire HTML document, but not necessarily its images, stylesheets or other assets, has loaded.  Based on [6596].  [sam, Mislav Marohnić] 

spinoffs/prototype/branches/1-6-0-events/src/event.js

@@ -125 +125 @@
-  
-  function getWrappersForEventName(id, eventName) {
-, name = getDOMEventName(eventName)
-name] = c[n
+
+eventName] = c[eventN
-  }
-  
@@ -185 +185 @@
-      element = $(element);
-      var id = getEventID(element), name = getDOMEventName(eventName);
+      
+      if (!handler && eventName) {
+        return getWrappersForEventName(id, eventName).each(function(wrapper) {
+          element.stopObserving(eventName, wrapper.handler);
+        }) && false;
+        
+      } else if (!eventName) {
+        return Object.keys(getCacheForID(id)).each(function(eventName) {
+          element.stopObserving(eventName);
+        }) && false;
+      }
-      
-      var wrapper = findWrapper(id, eventName, handler);

spinoffs/prototype/branches/1-6-0-events/test/unit/event.html

@@ -129 +129 @@
-    }},
-    
+    testMultipleCustomEventObserversWithTheSameHandler: function() { with(this) {
+      var span = $("span"), count = 0, observer = function() { count++ };
+      
+      span.observe("somethingHappened", observer);
+      span.observe("somethingElseHappened", observer);
+      span.fire("somethingHappened");
+      assertEqual(1, count);
+      span.fire("somethingElseHappened");
+      assertEqual(2, count);
+    }},
+    
+    testStopObservingWithoutArguments: function() { with(this) {
+      var span = $("span"), count = 0, observer = function() { count++ };
+      
+      span.observe("somethingHappened", observer);
+      span.observe("somethingElseHappened", observer);
+      span.stopObserving();
+      span.fire("somethingHappened");
+      assertEqual(0, count);
+      span.fire("somethingElseHappened");
+      assertEqual(0, count);
+    }},
+    
+    testStopObservingWithoutHandlerArgument: function() { with(this) {
+      var span = $("span"), count = 0, observer = function() { count++ };
+      
+      span.observe("somethingHappened", observer);
+      span.observe("somethingElseHappened", observer);
+      span.stopObserving("somethingHappened");
+      span.fire("somethingHappened");
+      assertEqual(0, count);
+      span.fire("somethingElseHappened");
+      assertEqual(1, count);
+      span.stopObserving("somethingElseHappened");
+      span.fire("somethingElseHappened");
+      assertEqual(1, count);
+    }},
+    
-    testDocumentContentLoadedEventFiresBeforeWindowLoad: function() { with(this) {
-      assert(eventResults.contentLoaded, "contentLoaded");