X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2FeventTest.js;h=312b1e5656cf0a89f60ebb64d34f232325f3b9d6;hb=54035207fe91cb57f49bb8c0c9f7b4ada8d05346;hp=d6d1160997902be931926e054168791eb6558398;hpb=03d268025966059201fac5d7b6da5c210d22b9f2;p=jquery.git
diff --git a/src/event/eventTest.js b/src/event/eventTest.js
index d6d1160..312b1e5 100644
--- a/src/event/eventTest.js
+++ b/src/event/eventTest.js
@@ -1,13 +1,15 @@
module("event");
test("bind()", function() {
- expect(10);
+ expect(12);
var handler = function(event) {
ok( event.data, "bind() with data, check passed data exists" );
ok( event.data.foo == "bar", "bind() with data, Check value of passed data" );
- }
- $("#firstp").bind("click", {foo: "bar"}, handler).click();
+ };
+ $("#firstp").bind("click", {foo: "bar"}, handler).click().unbind("click", handler);
+
+ ok( !$("#firstp").get(0).$events, "Event handler unbound when using data." );
reset();
var handler = function(event, data) {
@@ -15,31 +17,33 @@ test("bind()", function() {
ok( event.data.foo == "bar", "Check value of passed data" );
ok( data, "Check trigger data" );
ok( data.bar == "foo", "Check value of trigger data" );
- }
- $("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]);
+ };
+ $("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]).unbind(handler);
+
+ reset();
+ var handler = function(event) {
+ ok ( !event.data, "Check that no data is added to the event object" );
+ };
+ $("#firstp").bind("click", handler).trigger("click");
+
// events don't work with iframes, see #939
- var tmp = document.createElement('iframe');
- document.body.appendChild( tmp );
- var doc = tmp.contentWindow.document;
- doc.open();
- doc.write("");
- doc.close();
+ 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" );
- });
-
- triggerEvent( input, "click" );
+ }).click();
- document.body.removeChild( tmp );
+ //triggerEvent( input, "click" );
var counter = 0;
function selectOnChange(event) {
equals( event.data, counter++, "Event.data is not a global event object" );
- }
+ };
$("select").each(function(i){
$(this).bind('change', i, selectOnChange);
}).trigger('change');
@@ -90,7 +94,7 @@ test("trigger(event, [data]", function() {
ok( a == 1, "check passed data" );
ok( b == "2", "check passed data" );
ok( c == "abc", "check passed data" );
- }
+ };
$("#firstp").bind("click", handler).trigger("click", [1, "2", "abc"]);
});