From ff4f265bc0273bda0c8873d470aefa20170abc41 Mon Sep 17 00:00:00 2001 From: Brandon Aaron Date: Sun, 13 May 2007 05:53:49 +0000 Subject: [PATCH] Fix for #1162 --- src/jquery/coreTest.js | 17 +++++++++++++++-- src/jquery/jquery.js | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js index a0ae82a..4776a66 100644 --- a/src/jquery/coreTest.js +++ b/src/jquery/coreTest.js @@ -359,7 +359,7 @@ test("wrap(String|Element)", function() { }); test("append(String|Element|Array<Element>|jQuery)", function() { - expect(16); + expect(17); var defaultText = 'Try them out:' var result = $('#first').append('buga'); ok( result.text() == defaultText + 'buga', 'Check if text appending works' ); @@ -420,6 +420,13 @@ test("append(String|Element|Array<Element>|jQuery)", function() { $('#table colgroup').append(''); ok( $('#table colgroup col').length, "Append col" ); + + reset(); + $('form:last') + .append('') + .append(''); + + t( "Append Select", "#appendSelect1, #appendSelect2", ["appendSelect1", "appendSelect2"] ); }); test("appendTo(String|Element|Array<Element>|jQuery)", function() { @@ -473,7 +480,7 @@ test("prepend(String|Element|Array<Element>|jQuery)", function() { }); test("prependTo(String|Element|Array<Element>|jQuery)", function() { - expect(5); + expect(6); var defaultText = 'Try them out:' $('buga').prependTo('#first'); ok( $('#first').text() == 'buga' + defaultText, 'Check if text prepending works' ); @@ -493,6 +500,12 @@ test("prependTo(String|Element|Array<Element>|jQuery)", function() { expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog"; $("#yahoo, #first").prependTo('#sap'); ok( expected == $('#sap').text(), "Check for prepending of jQuery object" ); + + reset(); + $('').prependTo('form:last'); + $('').prependTo('form:last'); + + t( "Prepend Select", "#prependSelect1, #prependSelect2", ["prependSelect1", "prependSelect2"] ); }); test("before(String|Element|Array<Element>|jQuery)", function() { diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 8ef7062..d9292ed 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -1523,7 +1523,7 @@ jQuery.extend({ if ( 0 === arg.length && !jQuery(arg).is("form, select") ) return; - if ( arg[0] == undefined || jQuery(arg).is("form, select") ) + if ( arg[0] == undefined || jQuery.nodeName(arg, "form") || arg.options ) r.push( arg ); else r = jQuery.merge( r, arg ); -- 1.7.10.4