Changeset 4436

Timestamp:

01/14/08 09:33:08 (1 year ago)

Author:

joern.zaefferer

Message:

fix for #2114; refactored tests for bind() to highlight failing select-change-test

Location:

trunk/jquery

Files:

• src/core.js (modified) (2 diffs)
• test/unit/event.js (modified) (7 diffs)

trunk/jquery/src/core.js

@@ -39 +39 @@
 
         // Handle $(DOMElement)
-        if ( selector.nodeType ) {
+        if ( selector.nodeType && !selector.length ) {
             this[0] = selector;
             this.length = 1;
@@ -94 +94 @@
             // HANDLE: $(arraylike)
             // Watch for when an array-like object, contains DOM nodes, is passed in as the selector
-            (selector.jquery || selector.length && selector != window && !selector.nodeType && selector[0] != undefined && selector[0].nodeType) && jQuery.makeArray( selector ) ||
+            (selector.jquery || selector.length && selector != window && selector[0] != undefined && selector[0].nodeType) && jQuery.makeArray( selector ) ||
 
             // HANDLE: $(*)

trunk/jquery/test/unit/event.js

@@ -1 +1 @@
 module("event");
 
-test("bind()", function() {
-    expect(19);
-
+test("bind(), with data", function() {
+    expect(3);
     var handler = function(event) {
         ok( event.data, "bind() with data, check passed data exists" );
@@ -11 +10 @@
 
     ok( !jQuery.data($("#firstp")[0], "events"), "Event handler unbound when using data." );
-    
-    reset();
+});
+
+test("bind(), with data, trigger with data", function() {
+    expect(4);
     var handler = function(event, data) {
         ok( event.data, "check passed data exists" );
@@ -20 +21 @@
     };
     $("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]).unbind("click", handler);
-    
-    reset();
-    var clickCounter = mouseoverCounter = 0;
+});
+
+test("bind(), multiple events at once", function() {
+    expect(2);
+    var clickCounter = 0,
+        mouseoverCounter = 0;
     var handler = function(event) {
         if (event.type == "click")
@@ -32 +36 @@
     ok( clickCounter == 1, "bind() with multiple events at once" );
     ok( mouseoverCounter == 1, "bind() with multiple events at once" );
-    
-    
-    reset();
+});
+
+test("bind(), no data", function() {
+    expect(1);
     var handler = function(event) {
         ok ( !event.data, "Check that no data is added to the event object" );
     };
     $("#firstp").bind("click", handler).trigger("click");
-    
-    
+});
+
+test("bind(), iframes", function() {
     // events don't work with iframes, see #939 - this test fails in IE because of contentDocument
     // var doc = document.getElementById("iframe").contentDocument;
@@ -51 +57 @@
     //  ok( true, "Binding to element inside iframe" );
     // }).click();
-    
+});
+
+test("bind(), trigger change on select", function() {
+    expect(3);
     var counter = 0;
     function selectOnChange(event) {
@@ -59 +68 @@
         $(this).bind('change', i, selectOnChange);
     }).trigger('change');
-
-    reset();
+});
+
+test("bind(), namespaced events, cloned events", function() {
+    expect(6);
 
     $("#firstp").bind("click",function(e){
@@ -90 +101 @@
     $("<a href='#fail' class='test'>test</a>").click(function(){ return false; }).appendTo("p");
     ok( $("a.test:first").triggerHandler("click") === false, "Handler is bound to appendTo'd elements" );
-    reset();
 });