X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=inline;f=test%2Funit%2Fevent.js;h=e1a95497d3010f206748a73fa653d42aca1bc5e0;hb=4d13f3701c59cac1bdfd2e826fd7dcb6148fc48e;hp=334f286c78d37d78d64214780d934dae2bb780b7;hpb=6728e3cf74d02794113deb0af70a5f9a7caa2241;p=jquery.git
diff --git a/test/unit/event.js b/test/unit/event.js
index 334f286..e1a9549 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -8,8 +8,8 @@ test("bind()", function() {
ok( event.data.foo == "bar", "bind() with data, Check value of passed data" );
};
$("#firstp").bind("click", {foo: "bar"}, handler).click().unbind("click", handler);
-
- ok( !$("#firstp").get(0).$events, "Event handler unbound when using data." );
+
+ ok( !jQuery.data($("#firstp")[0], "events"), "Event handler unbound when using data." );
reset();
var handler = function(event, data) {
@@ -31,9 +31,9 @@ test("bind()", function() {
// var doc = document.getElementById("iframe").contentDocument;
//
// doc.body.innerHTML = "";
- //
+ //
// var input = doc.getElementsByTagName("input")[0];
- //
+ //
// $(input).bind("click",function() {
// ok( true, "Binding to element inside iframe" );
// }).click();
@@ -48,34 +48,34 @@ test("bind()", function() {
reset();
- $("#firstp").bind("click",function(e){
+ $("#firstp").bind("click",function(e){
ok(true, "Normal click triggered");
- });
+ });
- $("#firstp").bind("click.test",function(e){
+ $("#firstp").bind("click.test",function(e){
ok(true, "Namespaced click triggered");
- });
+ });
// Trigger both bound fn (2)
- $("#firstp").trigger("click");
+ $("#firstp").trigger("click");
// Trigger one bound fn (1)
- $("#firstp").trigger("click.test");
+ $("#firstp").trigger("click.test");
// Remove only the one fn
- $("#firstp").unbind("click.test");
+ $("#firstp").unbind("click.test");
// Trigger the remaining fn (1)
- $("#firstp").trigger("click");
+ $("#firstp").trigger("click");
});
test("click()", function() {
expect(4);
$('
Change location').prependTo('#firstUL').find('a').bind('click', function() {
- var close = $('spanx', this); // same with $(this).find('span');
- ok( close.length == 0, "Context element does not exist, length must be zero" );
- ok( !close[0], "Context element does not exist, direct access to element must return undefined" );
- return false;
+ var close = $('spanx', this); // same with $(this).find('span');
+ ok( close.length == 0, "Context element does not exist, length must be zero" );
+ ok( !close[0], "Context element does not exist, direct access to element must return undefined" );
+ return false;
}).click();
$("#check1").click(function() {
@@ -108,15 +108,15 @@ test("unbind(event)", function() {
el.click(function() { return; });
el.unbind('change',function(){ return; });
- for (var ret in el[0].$events['click']) break;
+ for (var ret in jQuery.data(el[0], "events")['click']) break;
ok( ret, "Extra handlers weren't accidentally removed." );
el.unbind('click');
- ok( !el[0].$events, "Removed the events expando after all handlers are unbound." );
+ ok( !jQuery.data(el[0], "events"), "Removed the events expando after all handlers are unbound." );
});
test("trigger(event, [data], [fn])", function() {
- expect(40);
+ expect(66);
var handler = function(event, a, b, c) {
equals( event.type, "click", "check passed data" );
@@ -130,7 +130,22 @@ test("trigger(event, [data], [fn])", function() {
equals( a, 1, "check passed data" );
equals( b, "2", "check passed data" );
equals( c, "abc", "check passed data" );
- return "test2";
+ return false;
+ };
+
+ var handler3 = function(a, b, c, v) {
+ equals( a, 1, "check passed data" );
+ equals( b, "2", "check passed data" );
+ equals( c, "abc", "check passed data" );
+ equals( v, "test", "check current value" );
+ return "newVal";
+ };
+
+ var handler4 = function(a, b, c, v) {
+ equals( a, 1, "check passed data" );
+ equals( b, "2", "check passed data" );
+ equals( c, "abc", "check passed data" );
+ equals( v, "test", "check current value" );
};
// Simulate a "native" click
@@ -143,36 +158,48 @@ test("trigger(event, [data], [fn])", function() {
$("#firstp").bind("click", handler).trigger("click", [1, "2", "abc"]);
// Triggers handlers, native, and extra fn
- // Triggers 8
- $("#firstp").trigger("click", [1, "2", "abc"], handler2);
+ // Triggers 9
+ $("#firstp").trigger("click", [1, "2", "abc"], handler4);
// Simulate a "native" click
$("#firstp")[0].click = function(){
ok( false, "Native call was triggered" );
};
+ // Triggers handlers, native, and extra fn
+ // Triggers 7
+ $("#firstp").trigger("click", [1, "2", "abc"], handler2);
+
// Trigger only the handlers (no native)
// Triggers 5
equals( $("#firstp").triggerHandler("click", [1, "2", "abc"]), "test", "Verify handler response" );
// Trigger only the handlers (no native) and extra fn
// Triggers 8
- equals( $("#firstp").triggerHandler("click", [1, "2", "abc"], handler2), "test", "Verify handler response" );
+ equals( $("#firstp").triggerHandler("click", [1, "2", "abc"], handler2), false, "Verify handler response" );
// Build fake click event to pass in
- var eventObj = jQuery.event.fix({ type: "click", target: document.body });
+ var eventObj = jQuery.event.fix({ type: "foo", target: document.body });
// Trigger only the handlers (no native), with external event obj
// Triggers 5
- equals( $("#firstp").triggerHandler("foo", [eventObj, 1, "2", "abc"]), "test", "Verify handler response" );
+ equals( $("#firstp").triggerHandler("click", [eventObj, 1, "2", "abc"]), "test", "Verify handler response" );
// Trigger only the handlers (no native) and extra fn, with external event obj
// Triggers 9
- equals( $("#firstp").triggerHandler("foo", [eventObj, 1, "2", "abc"], handler), "test", "Verify handler response" );
+ equals( $("#firstp").triggerHandler("click", [eventObj, 1, "2", "abc"], handler), "test", "Verify handler response" );
+
+ // have the extra handler override the return
+ // Triggers 9
+ equals( $("#firstp").triggerHandler("click", [1, "2", "abc"], handler3), "newVal", "Verify triggerHandler return is overwritten by extra function" );
+
+ // have the extra handler leave the return value alone
+ // Triggers 9
+ equals( $("#firstp").triggerHandler("click", [1, "2", "abc"], handler4), "test", "Verify triggerHandler return is not overwritten by extra function" );
});
test("toggle(Function, Function)", function() {
- expect(4);
+ expect(5);
var count = 0,
fn1 = function(e) { count++; },
fn2 = function(e) { count--; },
@@ -180,7 +207,11 @@ test("toggle(Function, Function)", function() {
link = $('#mark');
link.click(preventDefault).click().toggle(fn1, fn2).click().click().click().click().click();
ok( count == 1, "Check for toggle(fn, fn)" );
-
+
+ $("#firstp").toggle(function () {
+ equals(arguments.length, 4, "toggle correctly passes through additional triggered arguments, see #1701" )
+ }, function() {}).trigger("click", [ 1, 2, 3 ]);
+
var first = 0;
$("#simon1").one("click", function() {
ok( true, "Execute event only once" );