From 14b09024cbe39bc16200448170ccbd183e3a9ec2 Mon Sep 17 00:00:00 2001 From: Brandon Aaron Date: Tue, 17 Oct 2006 19:12:22 +0000 Subject: [PATCH] Fix and tests for appending HTML options to select elements. Fixed previous tests for 193 and 170. --- build/test/index.html | 2 +- src/jquery/jquery.js | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build/test/index.html b/build/test/index.html index d79ba4e2..c07230f4 100644 --- a/build/test/index.html +++ b/build/test/index.html @@ -71,7 +71,7 @@ -

Float test. + Float test. diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 686c20d7..9768eee0 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -539,7 +539,7 @@ jQuery.fn = jQuery.prototype = { * $('#floatTest').css({cssFloat: 'left'}); * ok( $('#floatTest').css('cssFloat') == 'left', 'Modified CSS float using "cssFloat": Assert float is left'); * $('#floatTest').css({'float': 'right'}); - * ok( $('#floatTest').css('cssFloat') == 'right', 'Modified CSS float using "cssFloat": Assert float is right'); + * ok( $('#floatTest').css('float') == 'right', 'Modified CSS float using "float": Assert float is right'); * $('#floatTest').css({'font-size': '30px'}); * ok( $('#floatTest').css('font-size') == '30px', 'Modified CSS font-size: Assert font-size is 30px'); * @@ -568,7 +568,7 @@ jQuery.fn = jQuery.prototype = { * $('#floatTest').css('cssFloat', 'right'); * ok( $('#floatTest').css('cssFloat') == 'right', 'Modified CSS float using "cssFloat": Assert float is right'); * $('#floatTest').css('float', 'left'); - * ok( $('#floatTest').css('cssFloat') == 'left', 'Modified CSS float using "cssFloat": Assert float is left'); + * ok( $('#floatTest').css('float') == 'left', 'Modified CSS float using "float": Assert float is left'); * $('#floatTest').css('font-size', '20px'); * ok( $('#floatTest').css('font-size') == '20px', 'Modified CSS font-size: Assert font-size is 20px'); * @@ -701,6 +701,7 @@ jQuery.fn = jQuery.prototype = { * @test var defaultText = 'Try them out:' * var result = $('#first').append('buga'); * ok( result.text() == defaultText + 'buga', 'Check if text appending works' ); + * ok( $('#select3').append('').find('option:last-child').attr('value') == 'appendTest', 'Appending html options to select element'); * * @name append * @type jQuery @@ -764,6 +765,7 @@ jQuery.fn = jQuery.prototype = { * @test var defaultText = 'Try them out:' * var result = $('#first').prepend('buga'); * ok( result.text() == 'buga' + defaultText, 'Check if text prepending works' ); + * ok( $('#select3').prepend('').find('option:first-child').attr('value') == 'prependTest', 'Prepending html options to select element'); * * @name prepend * @type jQuery @@ -1546,7 +1548,10 @@ jQuery.extend({ var table = ""; - if ( !a[i].indexOf(""; + } else if ( !a[i].indexOf(""; } else if ( !a[i].indexOf("