diff options
author | Yehuda Katz <wycats@gmail.com> | 2009-07-17 17:33:44 +0000 |
---|---|---|
committer | Yehuda Katz <wycats@gmail.com> | 2009-07-17 17:33:44 +0000 |
commit | 1a7f72e7fe96654838074f88c79e021d37c5c30a (patch) | |
tree | 39f5f1ea97c9c24aebae91fa9ff97e84325eb924 | |
parent | 88bd74c732283cf8cd5e778439f0ea23654519d3 (diff) | |
download | jquery-1a7f72e7fe96654838074f88c79e021d37c5c30a.tar.gz jquery-1a7f72e7fe96654838074f88c79e021d37c5c30a.zip |
Add test for jQuery(jQueryObj) cloning and simplify new get() code
-rw-r--r-- | src/core.js | 5 | ||||
-rw-r--r-- | test/unit/core.js | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/core.js b/src/core.js index 267bc104f..a74f0fec9 100644 --- a/src/core.js +++ b/src/core.js @@ -43,9 +43,8 @@ jQuery.fn = jQuery.prototype = { // Handle $(DOMElement) if ( selector.nodeType ) { - this[0] = selector; + this.context = this[0] = selector; this.length++; - this.context = selector; return this; } @@ -132,7 +131,7 @@ jQuery.fn = jQuery.prototype = { this.toArray() : // Return just the object - ( num < 0 ? this.toArray.call(this, num)[0] : this[ num ] ); + ( num < 0 ? this.toArray(num)[ 0 ] : this[ num ] ); }, // Take an array of elements and push it onto the stack diff --git a/test/unit/core.js b/test/unit/core.js index 8aa883aed..28be65336 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -12,7 +12,7 @@ test("Basic requirements", function() { }); test("jQuery()", function() { - expect(11); + expect(12); // Basic constructor's behavior @@ -21,6 +21,9 @@ test("jQuery()", function() { equals( jQuery(null).length, 0, "jQuery(null) === jQuery([])" ); equals( jQuery("").length, 0, "jQuery('') === jQuery([])" ); + var obj = jQuery("div") + equals( jQuery(obj).selector, "div", "jQuery(jQueryObj) == jQueryObj" ); + // can actually yield more than one, when iframes are included, the window is an array as well equals( 1, jQuery(window).length, "Correct number of elements generated for jQuery(window)" ); |