event handlers now receive custom data in multiple arguments

For jQuery compatibility. closes #183
madrobby · Aug 1, 2011 · 11de4dc · 11de4dc
1 parent 90a0ec1
commit 11de4dc
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/event.js b/src/event.js
@@ -31,7 +31,7 @@
     events.split(/\s/).forEach(function(event){
       var callback = delegate || fn;
       var proxyfn = function (event) {
-        var result = callback.call(element, event, event.data);
+        var result = callback.apply(element, [event].concat(event.data));
         if (result === false) {
           event.preventDefault();
         }

diff --git a/test/zepto.html b/test/zepto.html
@@ -1663,6 +1663,30 @@ <h1>Zepto DOM unit tests</h1>
         var $endTest2 = $('#end_test').find('div').find('span').end().end();
         t.assertEqual($endTest.length, $endTest2.length);
         t.assertEqual($endTest.get(0), $endTest2.get(0));
+      },
+
+      testCustomEvents: function (t) {
+        var $body = $(document.body);
+
+        $body.bind('custom', function(evt, a, b) {
+          t.assertEqual(a, 1);
+          t.assertEqual(b, 2);
+          $body.unbind();
+        })
+        $body.trigger('custom', [1, 2]);
+
+        $body.bind('custom', function(evt, a) {
+          t.assertEqual(a, 1);
+          $body.unbind();
+        })
+        $body.trigger('custom', 1);
+
+        var eventData = {z: 1};
+        $body.bind('custom', function(evt, a) {
+          t.assertEqual(a, eventData);
+          $body.unbind();
+        })
+        $body.trigger('custom', eventData);
       }
     });
   </script>