deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix for #1162

Browse source
This commit is contained in:
Brandon Aaron 2007-05-13 05:53:49 +00:00
parent a34a1a599b
commit ff4f265bc0
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/jquery/coreTest.js vendored
View file

@ -359,7 +359,7 @@ test("wrap(String|Element)", function() {
}); });
test("append(String|Element|Array<Element>|jQuery)", function() { test("append(String|Element|Array<Element>|jQuery)", function() {
expect(16); expect(17);
var defaultText = 'Try them out:' var defaultText = 'Try them out:'
var result = $('#first').append('<b>buga</b>'); var result = $('#first').append('<b>buga</b>');
ok( result.text() == defaultText + 'buga', 'Check if text appending works' ); ok( result.text() == defaultText + 'buga', 'Check if text appending works' );
@ -420,6 +420,13 @@ test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
$('#table colgroup').append('<col>'); $('#table colgroup').append('<col>');
ok( $('#table colgroup col').length, "Append col" ); ok( $('#table colgroup col').length, "Append col" );
reset();
$('form:last')
.append('<select id="appendSelect1"></select>')
.append('<select id="appendSelect2"><option>Test</option></select>');
t( "Append Select", "#appendSelect1, #appendSelect2", ["appendSelect1", "appendSelect2"] );
}); });
test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() { test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
@ -473,7 +480,7 @@ test("prepend(String|Element|Array&lt;Element&gt;|jQuery)", function() {
}); });
test("prependTo(String|Element|Array&lt;Element&gt;|jQuery)", function() { test("prependTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
expect(5); expect(6);
var defaultText = 'Try them out:' var defaultText = 'Try them out:'
$('<b>buga</b>').prependTo('#first'); $('<b>buga</b>').prependTo('#first');
ok( $('#first').text() == 'buga' + defaultText, 'Check if text prepending works' ); ok( $('#first').text() == 'buga' + defaultText, 'Check if text prepending works' );
@ -493,6 +500,12 @@ test("prependTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog"; expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
$("#yahoo, #first").prependTo('#sap'); $("#yahoo, #first").prependTo('#sap');
ok( expected == $('#sap').text(), "Check for prepending of jQuery object" ); ok( expected == $('#sap').text(), "Check for prepending of jQuery object" );
reset();
$('<select id="prependSelect1"></select>').prependTo('form:last');
$('<select id="prependSelect2"><option>Test</option></select>').prependTo('form:last');
t( "Prepend Select", "#prependSelect1, #prependSelect2", ["prependSelect1", "prependSelect2"] );
}); });
test("before(String|Element|Array&lt;Element&gt;|jQuery)", function() { test("before(String|Element|Array&lt;Element&gt;|jQuery)", function() {

2
src/jquery/jquery.js vendored
View file

@ -1523,7 +1523,7 @@ jQuery.extend({
if ( 0 === arg.length && !jQuery(arg).is("form, select") ) if ( 0 === arg.length && !jQuery(arg).is("form, select") )
return; return;
if ( arg[0] == undefined || jQuery(arg).is("form, select") ) if ( arg[0] == undefined || jQuery.nodeName(arg, "form") || arg.options )
r.push( arg ); r.push( arg );
else else
r = jQuery.merge( r, arg ); r = jQuery.merge( r, arg );