diff options
| author | John Resig <jeresig@gmail.com> | 2011-01-20 14:51:30 -0500 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2011-01-20 14:51:30 -0500 |
| commit | 2e2d5e9db5ee9886644d75954d327e6d284e2da8 (patch) | |
| tree | 91f6f7c23c3ff3faa64837b0f59771f7377a3888 | |
| parent | c97b6ee36a1402b6f4bb3f6893b687eb294c41df (diff) | |
| parent | 948c0dfffcf077ed71e4712b38a33d06ea63264c (diff) | |
| download | jquery-2e2d5e9db5ee9886644d75954d327e6d284e2da8.tar.gz jquery-2e2d5e9db5ee9886644d75954d327e6d284e2da8.zip | |
Merge branch 'fix-7853-add-context' of https://github.com/dmethvin/jquery into dmethvin-fix-7853-add-context
| -rw-r--r-- | src/traversing.js | 2 | ||||
| -rw-r--r-- | test/unit/traversing.js | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/traversing.js b/src/traversing.js index 929547c11..90601df55 100644 --- a/src/traversing.js +++ b/src/traversing.js @@ -141,7 +141,7 @@ jQuery.fn.extend({ add: function( selector, context ) { var set = typeof selector === "string" ? - jQuery( selector, context || this.context ) : + jQuery( selector, context ) : jQuery.makeArray( selector ), all = jQuery.merge( this.get(), set ); diff --git a/test/unit/traversing.js b/test/unit/traversing.js index f0471d74e..56fed2200 100644 --- a/test/unit/traversing.js +++ b/test/unit/traversing.js @@ -440,12 +440,13 @@ test("add(String|Element|Array|undefined)", function() { test("add(String, Context)", function() { expect(6); - - equals( jQuery(document).add("#form").length, 2, "Make sure that using regular context document still works." ); - equals( jQuery(document.body).add("#form").length, 2, "Using a body context." ); - equals( jQuery(document.body).add("#html").length, 1, "Using a body context." ); - - equals( jQuery(document).add("#form", document).length, 2, "Use a passed in document context." ); - equals( jQuery(document).add("#form", document.body).length, 2, "Use a passed in body context." ); - equals( jQuery(document).add("#html", document.body).length, 1, "Use a passed in body context." ); + + deepEqual( jQuery( "#firstp" ).add( "#ap" ).get(), q( "firstp", "ap" ), "Add selector to selector " ); + deepEqual( jQuery( document.getElementById("firstp") ).add( "#ap" ).get(), q( "firstp", "ap" ), "Add gEBId to selector" ); + deepEqual( jQuery( document.getElementById("firstp") ).add( document.getElementById("ap") ).get(), q( "firstp", "ap" ), "Add gEBId to gEBId" ); + + var ctx = document.getElementById("firstp"); + deepEqual( jQuery( "#firstp" ).add( "#ap", ctx ).get(), q( "firstp" ), "Add selector to selector " ); + deepEqual( jQuery( document.getElementById("firstp") ).add( "#ap", ctx ).get(), q( "firstp" ), "Add gEBId to selector, not in context" ); + deepEqual( jQuery( document.getElementById("firstp") ).add( "#ap", document.getElementsByTagName("body")[0] ).get(), q( "firstp", "ap" ), "Add gEBId to selector, in context" ); }); |