The second argument to Event.Handler callbacks is the target element …

…when no selector is present, or the matching element when a selector is present. Callbacks are always bound to the original element.
samleb · May 7, 2010 · b76ea83 · b76ea83
1 parent f372474
commit b76ea83
Show file tree

Hide file tree

Showing 4 changed files with 111 additions and 7 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,10 +1,12 @@
-Fix issue where `Element.Layout#get` would fail to interpret negative pixel values. (Sebastien Gruhier, Andrew Dupont)
+* The second argument to Event.Handler callbacks is the target element when no selector is present, or the matching element when a selector is present. Callbacks are always bound to the original element. (sam)
 
-Fix bugs in layout.js. Add tests for `Element.Layout#toCSS`, `#toObject`, and `#toHash`. (RStankov, Andrew Dupont)
+* Fix issue where `Element.Layout#get` would fail to interpret negative pixel values. (Sebastien Gruhier, Andrew Dupont)
 
-Add `Element.Layout#toObject` and `Element.Layout.toHash`. (Andrew Dupont)
+* Fix bugs in layout.js. Add tests for `Element.Layout#toCSS`, `#toObject`, and `#toHash`. (RStankov, Andrew Dupont)
 
-Make `Element.Layout#toCSS` return camelized property names, as expected by `Element.setStyle`. [#1021 state:resolved] (njakobsen, Andrew Dupont)
+* Add `Element.Layout#toObject` and `Element.Layout.toHash`. (Andrew Dupont)
+
+* Make `Element.Layout#toCSS` return camelized property names, as expected by `Element.setStyle`. [#1021 state:resolved] (njakobsen, Andrew Dupont)
 
 *1.7_rc1* (April 1, 2010)
 

diff --git a/src/dom/event.js b/src/dom/event.js
@@ -912,9 +912,8 @@
     },
 
     handleEvent: function(event) {
-      var element = this.selector ? event.findElement(this.selector) :
-       this.element;
-      if (element) this.callback.call(element, event, element);
+      var element = event.findElement(this.selector);
+      if (element) this.callback.call(this.element, event, element);
     }
   });
 

diff --git a/test/unit/event_handler_test.js b/test/unit/event_handler_test.js
@@ -0,0 +1,99 @@
+new Test.Unit.Runner((function() {
+  function handle(selector, callback) {
+    if (!callback) {
+      callback = selector;
+      selector = false;
+    }
+    return new Event.Handler("container", "test:event", selector, callback);
+  }
+
+  return {
+    testHandlersDoNothingIfStartHasNotBeenCalled: function() {
+      var fired = false;
+      this.handler = handle(function() { fired = true });
+
+      $("container").fire("test:event");
+      this.assert(!fired);
+    },
+
+    testHandlersAreFiredWhenStartIsCalled: function() {
+      var fired = false;
+      this.handler = handle(function() { fired = true });
+
+      this.handler.start();
+      this.assert(!fired);
+      $("container").fire("test:event");
+      this.assert(fired);
+    },
+
+    testHandlersDoNotFireAfterStartingAndThenStopping: function() {
+      var fired = 0;
+      this.handler = handle(function() { fired++ });
+
+      this.handler.start();
+      this.assertEqual(0, fired);
+      $("container").fire("test:event");
+      this.assertEqual(1, fired);
+      this.handler.stop();
+      $("container").fire("test:event");
+      this.assertEqual(1, fired);
+    },
+
+    testHandlersWithoutSelectorsPassTheTargetElementToCallbacks: function() {
+      var span = $("container").down("span");
+      this.handler = handle(function(event, element) {
+        this.assertEqual(span, element);
+      }.bind(this));
+
+      this.handler.start();
+      span.fire("test:event");
+    },
+
+    testHandlersWithSelectorsPassTheMatchedElementToCallbacks: function() {
+      var link = $("container").down("a"), span = link.down("span");
+      this.handler = handle("a", function(event, element) {
+        this.assertEqual(link, element);
+      }.bind(this));
+
+      this.handler.start();
+      span.fire("test:event");
+    },
+
+    testHandlersWithSelectorsDoNotCallTheCallbackIfNoMatchingElementIsFound: function() {
+      var paragraph = $("container").down("p", 1), fired = false;
+      this.handler = handle("a", function(event, element) { fired = true });
+
+      this.handler.start();
+      paragraph.fire("test:event");
+      this.assert(!fired);
+    },
+
+    testHandlerCallbacksAreBoundToTheOriginalElement: function() {
+      var span = $("container").down("span"), element;
+      this.handler = handle(function() { element = this });
+
+      this.handler.start();
+      span.fire("test:event");
+      this.assertEqual($("container"), element);
+    },
+
+    testCallingStartMultipleTimesDoesNotInstallMultipleObservers: function() {
+      var fired = 0;
+      this.handler = handle(function() { fired++ });
+
+      this.handler.start();
+      this.handler.start();
+      $("container").fire("test:event");
+      this.assertEqual(1, fired);
+    },
+
+    teardown: function() {
+      try {
+        this.handler.stop();
+      } catch (e) {
+      } finally {
+        delete this.handler;
+      }
+    }
+  }
+})());
diff --git a/test/unit/fixtures/event_handler.html b/test/unit/fixtures/event_handler.html
@@ -0,0 +1,4 @@
+<div id="container" style="display: none">
+  <p>Here's <a href="#"><span>a link</span></a>.</p>
+  <p>And here's another paragraph.</p>
+</div>