Fixed a bug in the jQuery.prop() addition and fixed the test cases to represent the current set of features.
This commit is contained in:
parent
b603ca03c4
commit
d0e8a2452e
10
src/jquery/coreTest.js
vendored
10
src/jquery/coreTest.js
vendored
|
@ -67,13 +67,9 @@ test("attr(String)", function() {
|
||||||
ok( $('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );
|
ok( $('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );
|
||||||
});
|
});
|
||||||
|
|
||||||
test("attr(String, Function|String)", function() {
|
test("attr(String, Function)", function() {
|
||||||
|
expect(1);
|
||||||
ok( $('#text1').attr('value', function() { return this.id })[0].value == "text1", "Set value from id" );
|
ok( $('#text1').attr('value', function() { return this.id })[0].value == "text1", "Set value from id" );
|
||||||
ok( $('#text2').attr('value', "${this.id}")[0].value == "text2", "Set value from id" );
|
|
||||||
reset();
|
|
||||||
$('#text1, #text2').attr({value: "${this.id + 'foobar'}"});
|
|
||||||
ok( $('#text1')[0].value == "text1foobar", "Set value from id" );
|
|
||||||
ok( $('#text2')[0].value == "text2foobar", "Set value from id" );
|
|
||||||
});
|
});
|
||||||
|
|
||||||
test("attr(Hash)", function() {
|
test("attr(Hash)", function() {
|
||||||
|
@ -440,4 +436,4 @@ test("removeAttr(String", function() {
|
||||||
test("text(String, Boolean)", function() {
|
test("text(String, Boolean)", function() {
|
||||||
ok( $("#foo").text("<div><b>Hello</b> cruel world!</div>")[0].innerHTML == "<div><b>Hello</b> cruel world!</div>", "Check escaped text" );
|
ok( $("#foo").text("<div><b>Hello</b> cruel world!</div>")[0].innerHTML == "<div><b>Hello</b> cruel world!</div>", "Check escaped text" );
|
||||||
ok( $("#foo").text("<div><b>Hello</b> cruel world!</div>", true)[0].innerHTML == "Hello cruel world!", "Check stripped text" );
|
ok( $("#foo").text("<div><b>Hello</b> cruel world!</div>", true)[0].innerHTML == "Hello cruel world!", "Check stripped text" );
|
||||||
});
|
});
|
||||||
|
|
2
src/jquery/jquery.js
vendored
2
src/jquery/jquery.js
vendored
|
@ -1235,7 +1235,7 @@ jQuery.extend({
|
||||||
prop: function(elem, key, value){
|
prop: function(elem, key, value){
|
||||||
// Handle executable functions
|
// Handle executable functions
|
||||||
return value.constructor == Function &&
|
return value.constructor == Function &&
|
||||||
value.call( elem, val ) || value;
|
value.call( elem ) || value;
|
||||||
},
|
},
|
||||||
|
|
||||||
className: {
|
className: {
|
||||||
|
|
Loading…
Reference in a new issue