X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=test%2Funit%2Fevent.js;h=8d69807e57067b1e1914cfbc2345564708bc958b;hb=8e40a84c24271c0a9253902ceb97185f243a3318;hp=e4caee82a54982d0c0017ac16d59cdff6352272b;hpb=328a86f9a0d3f0907cc950f7543e34cb3efbda3f;p=jquery.git
diff --git a/test/unit/event.js b/test/unit/event.js
index e4caee8..8d69807 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -2,22 +2,16 @@ module("event", { teardown: moduleTeardown });
test("null or undefined handler", function() {
expect(2);
- // Supports Fixes bug #7229
- try {
-
- jQuery("#firstp").click(null);
-
- ok(true, "Passing a null handler will not throw an exception");
-
- } catch (e) {}
-
- try {
-
- jQuery("#firstp").click(undefined);
-
- ok(true, "Passing an undefined handler will not throw an exception");
+ // Supports Fixes bug #7229
+ try {
+ jQuery("#firstp").click(null);
+ ok(true, "Passing a null handler will not throw an exception");
+ } catch (e) {}
- } catch (e) {}
+ try {
+ jQuery("#firstp").click(undefined);
+ ok(true, "Passing an undefined handler will not throw an exception");
+ } catch (e) {}
});
test("bind(), with data", function() {
@@ -312,7 +306,7 @@ test("bind/delegate bubbling, isDefaultPrevented", function() {
// Use a native click so we don't get jQuery simulated bubbling
if ( document.createEvent ) {
var e = document.createEvent( 'MouseEvents' );
- e.initEvent( "click", true, true );
+ e.initEvent( "click", true, true );
$jq[0].dispatchEvent(e);
}
else if ( $jq[0].click ) {
@@ -367,38 +361,47 @@ test("bind(), trigger change on select", function() {
}).trigger('change');
});
-test("bind(), namespaced events, cloned events", function() {
- expect(6);
+test("bind(), namespaced events, cloned events", 18, function() {
+ var firstp = jQuery( "#firstp" );
- jQuery("#firstp").bind("custom.test",function(e){
- ok(true, "Custom event triggered");
+ firstp.bind("custom.test",function(e){
+ ok(false, "Custom event triggered");
});
- jQuery("#firstp").bind("click",function(e){
+ firstp.bind("click",function(e){
ok(true, "Normal click triggered");
+ equal( e.type + e.namespace, "click", "Check that only click events trigger this fn" );
});
- jQuery("#firstp").bind("click.test",function(e){
- ok(true, "Namespaced click triggered");
+ firstp.bind("click.test",function(e){
+ var check = "click";
+ ok( true, "Namespaced click triggered" );
+ if ( e.namespace ) {
+ check += "test";
+ }
+ equal( e.type + e.namespace, check, "Check that only click/click.test events trigger this fn" );
});
- // Trigger both bound fn (2)
- jQuery("#firstp").trigger("click");
+ //clone(true) element to verify events are cloned correctly
+ firstp = firstp.add( firstp.clone( true ).attr( "id", "firstp2" ).insertBefore( firstp ) );
- // Trigger one bound fn (1)
- jQuery("#firstp").trigger("click.test");
+ // Trigger both bound fn (8)
+ firstp.trigger("click");
+
+ // Trigger one bound fn (4)
+ firstp.trigger("click.test");
// Remove only the one fn
- jQuery("#firstp").unbind("click.test");
+ firstp.unbind("click.test");
- // Trigger the remaining fn (1)
- jQuery("#firstp").trigger("click");
+ // Trigger the remaining fn (4)
+ firstp.trigger("click");
- // Remove the remaining fn
- jQuery("#firstp").unbind(".test");
+ // Remove the remaining namespaced fn
+ firstp.unbind(".test");
- // Trigger the remaining fn (0)
- jQuery("#firstp").trigger("custom");
+ // Try triggering the custom event (0)
+ firstp.trigger("custom");
// using contents will get comments regular, text, and comment nodes
jQuery("#nonnodes").contents().bind("tester", function () {
@@ -406,7 +409,7 @@ test("bind(), namespaced events, cloned events", function() {
}).trigger("tester");
// Make sure events stick with appendTo'd elements (which are cloned) #2027
- jQuery("test").click(function(){ return false; }).appendTo("p");
+ jQuery("test").click(function(){ return false; }).appendTo("#main");
ok( jQuery("a.test:first").triggerHandler("click") === false, "Handler is bound to appendTo'd elements" );
});
@@ -471,7 +474,7 @@ test("bind(), multi-namespaced events", function() {
test("bind(), with same function", function() {
expect(2)
- var count = 0 , func = function(){
+ var count = 0, func = function(){
count++;
};
@@ -548,7 +551,7 @@ test("bind(name, false), unbind(name, false)", function() {
});
test("bind()/trigger()/unbind() on plain object", function() {
- expect( 8 );
+ expect( 7 );
var obj = {};
@@ -570,7 +573,6 @@ test("bind()/trigger()/unbind() on plain object", function() {
var events = jQuery._data(obj, "events");
ok( events, "Object has events bound." );
equals( obj.events, undefined, "Events object on plain objects is not events" );
- equals( typeof events, "function", "'events' expando is a function on plain objects." );
equals( obj.test, undefined, "Make sure that test event is not on the plain object." );
equals( obj.handle, undefined, "Make sure that the event handler is not on the plain object." );
@@ -588,7 +590,7 @@ test("bind()/trigger()/unbind() on plain object", function() {
jQuery(obj).unbind("test");
equals( obj && obj[ jQuery.expando ] &&
- obj[ jQuery.expando ][ jQuery.expando ] &&
+ obj[ jQuery.expando ][ jQuery.expando ] &&
obj[ jQuery.expando ][ jQuery.expando ].events, undefined, "Make sure events object is removed" );
});