Fixed #1074 where .html() was incorrectly changing the selected value of an option.
This commit is contained in:
parent
32b3ac4f06
commit
264ffbc73b
2 changed files with 7 additions and 3 deletions
|
@ -932,7 +932,7 @@ jQuery.extend({
|
|||
var wrap =
|
||||
// option or optgroup
|
||||
!tags.indexOf("<opt") &&
|
||||
[ 1, "<select>", "</select>" ] ||
|
||||
[ 1, "<select multiple='multiple'>", "</select>" ] ||
|
||||
|
||||
!tags.indexOf("<leg") &&
|
||||
[ 1, "<fieldset>", "</fieldset>" ] ||
|
||||
|
|
|
@ -882,15 +882,19 @@ test("val(String)", function() {
|
|||
var scriptorder = 0;
|
||||
|
||||
test("html(String)", function() {
|
||||
expect(9);
|
||||
expect(10);
|
||||
var div = $("div");
|
||||
div.html("<b>test</b>");
|
||||
var pass = true;
|
||||
for ( var i = 0; i < div.size(); i++ ) {
|
||||
if ( div.get(i).childNodes.length == 0 ) pass = false;
|
||||
if ( div.get(i).childNodes.length == 0 ) pass = false;
|
||||
}
|
||||
ok( pass, "Set HTML" );
|
||||
|
||||
$("#main").html("<select/>");
|
||||
$("#main select").html("<option>O1</option><option selected='selected'>O2</option><option>O3</option>");
|
||||
equals( $("#main select").val(), "O2", "Selected option correct" );
|
||||
|
||||
stop();
|
||||
|
||||
$("#main").html('<script type="text/javascript">ok( true, "$().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script>');
|
||||
|
|
Loading…
Reference in a new issue