diff options
author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2007-01-10 09:37:22 +0000 |
---|---|---|
committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2007-01-10 09:37:22 +0000 |
commit | a5f9108a2109b2ed5778af860b0928d8e6b0fdd2 (patch) | |
tree | 23d5249ae54a2fd0d82c834f48288ced9cd61e5f /src | |
parent | 84ecf3937b156e7892131481ed6b1df230bbbbc7 (diff) | |
download | jquery-a5f9108a2109b2ed5778af860b0928d8e6b0fdd2.tar.gz jquery-a5f9108a2109b2ed5778af860b0928d8e6b0fdd2.zip |
Added tests for add() and fixed #770
Diffstat (limited to 'src')
-rw-r--r-- | src/jquery/coreTest.js | 10 | ||||
-rw-r--r-- | src/jquery/jquery.js | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js index 7466c4c64..1c81e0808 100644 --- a/src/jquery/coreTest.js +++ b/src/jquery/coreTest.js @@ -27,6 +27,16 @@ test("get(Number)", function() { ok( $("div").get(0) == document.getElementById("main"), "Get A Single Element" );
});
+test("add(String|Element|Array)", function() {
+ isSet( $("#sndp").add("#en").add("#sap").get(), q("sndp", "en", "sap"), "Check elements from document" );
+
+ ok( $([]).add($("#form")[0].elements).length > 13, "Check elements from array" );
+
+ var x = $([]).add($("<p id='x1'>xxx</p>")).add($("<p id='x2'>xxx</p>"));
+ ok( x[0].id == "x1", "Check on-the-fly element1" );
+ ok( x[1].id == "x2", "Check on-the-fly element2" );
+});
+
test("each(Function)", function() {
expect(1);
var div = $("div");
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index f927a35dd..0aac02620 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -951,9 +951,9 @@ jQuery.fn = jQuery.prototype = { */ add: function(t) { return this.set( jQuery.merge( - this.get(), typeof t == "string" ? - jQuery.find(t) : - t.constructor == Array ? t : [t] ) ); + this.get(), + typeof t == "string" ? jQuery.find(t) : t ) + ); }, /** |